Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

3 天以前 2b68e9f78a66afbb31ed1c93d9e1f13bdf2447e7

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 .env.development

@@ -5,8 +5,8 @@
ENV = 'development'

# 智云迈思L-MOM管理系统/开发环境
# VUE_APP_BASE_API = 'http://localhost:81/API/'
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
VUE_APP_BASE_API = http://localhost:81/API/
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://192.168.1.11/API/'

 .env.production

@@ -6,11 +6,12 @@

# 宁波 四维尔
# VUE_APP_BASE_API = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 余姚 锦隆 智能家居
# VUE_APP_BASE_API = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 智云迈思L-MOM管理系统/生产环境
VUE_APP_BASE_API = http://47.96.97.237/API/
# VUE_APP_BASE_API = http://47.96.97.237/API/
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/
# 路由懒加载 

 src/views/basic/gyUnit/gyUnit.vue

@@ -447,16 +447,16 @@
      this.editGyClose(); // 组件内的方法绑定到windows
    };
    this.queryParams.HOrgID = sessionStorage["OrganizationID"];

    this.riqiChange();
    this.handleQuery();
  },

  beforeDestroy() {
    // 组件销毁时清理全局方法，避免内存泄漏
    delete window.editGyClose;
  },
  created() {
    this.riqiChange();
    this.handleQuery();
  },
  created() {},
  methods: {
    onDateScanOptionChangerHandler(e) {
      this.queryParams.timeSpan = e;
@@ -1005,6 +1005,7 @@
        sWhere += " and 禁用标记 = '' and ISNULL(审核人,'')  != ''";
        return sWhere;
      }

      return sWhere;
    },
    //根据用户获取用户关联组织的过滤条件
@@ -1095,7 +1096,8 @@
        .confirm("确认要删除吗，删除后不能恢复")
        .then(() => {
          if (!this.rowForm.审核人) {
            const InterID = this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
            const InterID =
              this.rowForm.hmainid || this.rowForm.HItemID || this.rowForm.HInterID;
            axios
              .get(this.baseURL + "DeltetGy_Unit", {
                params: {
@@ -1147,8 +1149,8 @@
          this.$modal.msgError("接口请求失败!");
        });
    },


 
  

    // 反禁用/禁用数据
    set_De_Stop(num, form) {
@@ -1224,7 +1226,6 @@
      );
      return org ? org.Name : '';  // 只返回组织名称
    },


    // 提交上传文件
    submitFileForm() {

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -7,7 +7,7 @@
            <!-- <el-button @click="cancel">取 消</el-button> -->
        </div>
        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">运单编辑新增</div>
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form ref="form" :model="form" :rules="rules" label-width="120px">
            <el-tabs v-model="activeName" type="card">
                <el-tab-pane label="基本信息" name="first">
                    <el-row>
@@ -37,7 +37,7 @@
                            <el-form-item label="承运商" prop="HCarrierName">
                                <el-input v-model="form.HCarrierName" placeholder="请输入承运商">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(5)"></el-button>
                                        @click="openDataDialog(6)"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -53,7 +53,7 @@
                            <el-form-item label="始发地" prop="HBeginAddrName">
                                <el-input v-model="form.HBeginAddrName" placeholder="请输入始发地">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(7)"></el-button>
                                        @click="openDataDialog('暂无')"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -61,7 +61,7 @@
                            <el-form-item label="目的地" prop="HEndAddrName">
                                <el-input v-model="form.HEndAddrName" placeholder="请输入目的地">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(8)"></el-button>
                                        @click="openDataDialog('暂无')"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -71,7 +71,7 @@
                            <el-form-item label="车型" prop="HCarTypeName">
                                <el-input v-model="form.HCarTypeName" placeholder="请输入车型">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(9)"></el-button>
                                        @click="openDataDialog(13)"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -84,7 +84,7 @@
                            <el-form-item label="承运合同" prop="HContractTransportBillNo">
                                <el-input v-model="form.HContractTransportBillNo" placeholder="请输入承运合同">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(10)"></el-button>
                                        @click="openDataDialog('暂无')"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -109,7 +109,7 @@
                            <el-form-item label="结算方式" prop="HSSName">
                                <el-input v-model="form.HSSName" placeholder="请输入结算方式">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(11)"></el-button>
                                        @click="openDataDialog('暂无')"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -117,7 +117,7 @@
                            <el-form-item label="币别" prop="HCurName">
                                <el-input v-model="form.HCurName" placeholder="请输入币别">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(12)"></el-button>
                                        @click="openDataDialog('暂无')"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -219,7 +219,7 @@
                            <el-form-item label="车辆" prop="HCarName">
                                <el-input v-model="form.HCarName" placeholder="请输入车辆">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(13)"></el-button>
                                        @click="openDataDialog(14)"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -227,7 +227,7 @@
                            <el-form-item label="司机" prop="HDriverName">
                                <el-input v-model="form.HDriverName" placeholder="请输入司机">
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(14)"></el-button>
                                        @click="openDataDialog(15)"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
@@ -413,6 +413,10 @@
            <!-- 发货通知单 -->
            <XsSeOutStockBill @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="xsSeOutStockBillShow" />
            <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
            <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
            <GyCartype @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCartypeShow" />
            <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
            <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
            <div slot="footer" class="dialog-footer">
                <el-button type="primary" @click="deptClickSub">确 定</el-button>
                <el-button @click="deptClose">取 消</el-button>
@@ -434,10 +438,13 @@
import Material from '@/views/component/material'
import XsSeOutStockBill from '@/views/sell/XsSeOutStockBill.vue'
import GyCustomer from '@/views/GyCustomer'

import GySupplier from "@/views/basic/gy/gySupplier.vue";
import GyCartype from "@/views/basic/gyCartypelist/gyCartypelist.vue"
import GyCar from "@/views/basic/gyCar/gyCarList.vue"
import GyDriver from "@/views/system/user/GyDriver.vue"
export default {
    name: 'SellOutBill',
    components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer },
    components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver },
    props: {
        OperationType: { type: Number, },
        linterid: { type: Number, },
@@ -472,6 +479,10 @@
            stockPlaceShow: false,                                                     //仓位数据组件显示标记
            xsSeOutStockBillShow: false,                                               //原单（发货通知单）数据组件显示标记
            gyCustomerShow: false,                                                     //客户数据组件显示标记
            gySupplierShow: false,                                                     //承运商数据组件显示标记
            gyCartypeShow: false,                                                      //车型数据组件显示标记
            gyCarShow: false,                                                          //车辆数据组件显示标记
            gyDriverShow: false,                                                       //司机数据组件显示标记
            deptform: {},                                                              //弹窗选中数据

            temp: undefined,                                                           //临时变量
@@ -905,6 +916,10 @@
                this.dialogTitle = '仓位列表'
                this.stockPlaceShow = true
                this.openData = true
            } else if (num == 6) {
                this.dialogTitle = '承运商列表'
                this.gySupplierShow = true
                this.openData = true
            } else if (num == 7) {
                this.dialogTitle = '客户列表'
                this.gyCustomerShow = true
@@ -912,6 +927,18 @@
            } else if (num == 12) {
                this.dialogTitle = '源单列表'
                this.xsSeOutStockBillShow = true
                this.openData = true
            } else if (num == 13) {
                this.dialogTitle = '车型列表'
                this.gyCartypeShow = true
                this.openData = true
            } else if (num == 14) {
                this.dialogTitle = '车辆列表'
                this.gyCarShow = true
                this.openData = true
            } else if (num == 15) {
                this.dialogTitle = '车辆列表'
                this.gyDriverShow = true
                this.openData = true
            }

@@ -923,6 +950,10 @@
            this.materialShow = false
            this.gyCustomerShow = false
            this.xsSeOutStockBillShow = false
            this.gySupplierShow = false
            this.gyCartypeShow = false
            this.gyCarShow = false
            this.gyDriverShow = false
        },
        //#endregion
        //#endregion
@@ -956,13 +987,36 @@
                this.editData[this.zbIndex].HTaxPrice = deptRow.含税成本价
                this.editData[this.zbIndex].HTaxRate = deptRow.默认税率
                this.openData = false
            } else if (num == 6) {
                console.log(deptRow)
                this.form.HCarrierName = deptRow.供应商名称
                this.form.HCarrierID = deptRow.HItemID
                this.gySupplierShow = false
                this.openData = false
            } else if (num == 7) {
                this.form.HCusName = deptRow.客户名称
                this.form.HCusID = deptRow.HItemID
                this.gyCustomerShow = false
                this.openData = false
            } else if (num == 12) {                                                      //物料
            } else if (num == 12) {
                this.xsSeOutStockBillShow = false
                this.openData = false
            } else if (num == 13) {
                this.form.HCarTypeName = deptRow.车型名称
                this.form.HCarTypeID = deptRow.HItemID
                this.form.HCarTypeMaxVolume = deptRow["最大体积(立方米)"]
                this.calculateLoadingRate(parseFloat($('#HTotalVolume').val()) || 0);
                this.gyCartypeShow = false
                this.openData = false
            } else if (num == 14) {
                this.form.HCarName = deptRow.车辆名称
                this.form.HCarID = deptRow.HItemID
                this.gyCarShow = false
                this.openData = false
            } else if (num == 15) {
                this.form.HDriverName = deptRow.驾驶员名称
                this.form.HDriverID = deptRow.HItemID
                this.gyDriverShow = false
                this.openData = false
            }
        },
@@ -1107,10 +1161,10 @@
                    HSalePrice: 0,
                    HSeOrderInterID: 741,
                    HSeOrderEntryID: 18,
                    HSeOrderBillNo: 'XSFH00000747',
                    HSeOrderBillNo: '',
                    HSourceInterID: 741,
                    HSourceEntryID: 18,
                    HSourceBillNo: 'XSFH00000747',
                    HSourceBillNo: '',
                    HSourceBillType: 1402,
                    HRelationQty: 0,
                    HRelationMoney: 0,
@@ -1364,6 +1418,18 @@
            });
        },
        //#endregion

        // 计算装载率函数
        calculateLoadingRate(totalVolume) {
            var maxVolume = parseFloat((this.form.HCarTypeMaxVolume).val()) || 0;
            if (maxVolume > 0) {
                var loadingRate = (totalVolume / maxVolume * 100).toFixed(2);
                this.form.HLoadingRate=loadingRate + "%"
            } else {
               this.form.HLoadingRate==''
            }
        }
        //#endregion
        //#endregion 
    }
};

 src/views/scMould/basicModeling/Gy_MouldFile.vue

@@ -1152,8 +1152,8 @@
          // this.form.HMouldWidth = data.HMouldWidth
          // this.form.HMouldHeight = data.HMouldHeight
          // this.form.HMouldFoldHeight = data.HMouldFoldHeight
          this.form.HTransPackFlag = data.发货容器标记
          this.form.HSendPackFlag = data.周转容器标记
          this.form.HTransPackFlag = data.周转容器标记
          this.form.HSendPackFlag = data.发货容器标记
          this.form.HMouldFoldHeight = data.折叠高度
            this.form.HMouldLength = data.长
          this.form.HMouldWidth = data.宽