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

陈婷婷

1 天以前 7b849f06f0b0986b3955c1d1d91a0b2a79fa7ea6

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

 src/views/component/printList/index.vue

@@ -8,7 +8,7 @@
            <el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
                @selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
                <el-table-column type="selection" width="55" align="center" />
                <el-table-column align="center" label="模块代码" prop="HNumber" />
                <el-table-column align="center" label="模块代码" prop="HNumber" v-if="hideFlag" />
                <el-table-column align="center" label="模板名称" prop="模板名称" />
            </el-table>
        </el-form>
@@ -57,7 +57,8 @@
            colTitleName: '',
            tableIns: null,
            option: {},
            tableData: []
            tableData: [],
            hideFlag:false,                             //隐藏标记。用于设置某些不希望显示的标签                                          // 当前选中的行
        }
    },
    created() {

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -1293,6 +1293,10 @@
                var existingData = this.editData || [];
                var orginHQTY = 0;





                // 创建物料ID映射
                var materialMap = {};
                for (var i = 0; i < dataArray.length; i++) {
@@ -1522,6 +1526,7 @@
                return null;
            }
        },
        //#endregion
        //#region 工具栏按钮操作
        //#region 编辑提交保存
        submitForm() {

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -274,7 +274,7 @@
                        <el-input v-model="formVolume.单据号" placeholder="请输入单据号" disabled />
                    </el-form-item>
                    <el-form-item label="零单占用体积">
                        <el-input-number v-model="formVolume.currentVolume" placeholder="请输入零单占用体积" />
                        <el-input-number v-model="formVolume.currentVolume"  :placeholder="`零担体积: ${formVolume.零担体积 || 0}`"  />
                    </el-form-item>
                </el-form>
                <div slot="footer" class="dialog-footer">
@@ -860,6 +860,7 @@
                HInterID: 0,
                HEntryID0: 0,
                currentVolume: 0,
                
                单据号: ''
            }
        },
@@ -895,6 +896,7 @@
        cancelVolume() {
            this.openVolume = false
            this.resetVolume()
            this.handleQuery()
        },
        //#region 维护零单占用体积提交
        set_HScatteredVolumeList() {
@@ -1352,9 +1354,9 @@
            this.$refs.carDriverForm.validate((valid) => {
                if (valid) {
                    axios({
                        method: 'post',
                        url: this.baseURL + "/WLYayBillController/selectDriver1",
                        data: {
                        method: 'GET',
                        url: this.baseURL + "WLYayBillController/selectDriver1",
                            params: {  
                            "CarHNumber": this.carDriverForm.CarHNumber,
                            "CarHName": this.carDriverForm.CarHName,
                            "DriverHName": this.carDriverForm.DriverHName,

 src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue

@@ -92,6 +92,16 @@
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="子单据类型" prop="HBillSubType">
                <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                  <el-option label="发货" value="发货"></el-option>
                  <el-option label="客返" value="客返"></el-option>
                  <el-option label="供应商租借" value="供应商租借"></el-option>
                  <el-option label="供应商返还" value="供应商返还"></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="12">
@@ -305,6 +315,7 @@
      HIsShow: true,
      HIsHide: false,
      HModName: "Sc_MouldInRequestBill",
      HBillSubType:'',
      formShow: false,
      temp: undefined,
      formLoading: true,
@@ -388,6 +399,9 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
@@ -558,6 +572,7 @@
        HInterID: 0,
        HDate: new Date(),
        HStockOrgID:sessionStorage["OrganizationID"] - 0,
        HBillSubType: '',
        HSupTypeID:1,
        HSupName:'',
        HSupID:0,
@@ -787,6 +802,7 @@
                , "HExplanation": data.摘要
                , "HRemark": data.表头备注
                , "HStockOrgID": data.HStockOrgID
                , "HBillSubType": data.子单据类型
                
                , "HMaker": data.制单人
                , "HMakeDate": data.制单日期 == null ? "" : data.制单日期

 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue

@@ -31,6 +31,16 @@
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="12">
            <el-form-item label="子单据类型" prop="HBillSubType">
              <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                <el-option label="发货" value="发货"></el-option>
                <el-option label="客返" value="客返"></el-option>
                <el-option label="供应商租借" value="供应商租借"></el-option>
                <el-option label="供应商返还" value="供应商返还"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
@@ -440,6 +450,9 @@
        HStockInOrgID: [
          { required: true, message: "调入组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HStockOutOrgID: [
          { required: true, message: "调出组织不能为空", trigger: "blur" }
        ],
@@ -625,6 +638,7 @@
        HInterID: 0,
        HDate: new Date(),
        HStockInOrgID:sessionStorage["OrganizationID"] - 0,
        HBillSubType: '',
        HSupTypeID:1,
        HSupName:'',
        HSupID:0,
@@ -865,6 +879,7 @@
                , "HRemark": data.表头备注
                , "HStockInOrgID": data.HStockInOrgID
                , "HStockOutOrgID": data.HStockOutOrgID
                ,"HBillSubType": data.子单据类型
                
                , "HMaker": data.制单人
                , "HMakeDate": data.制单日期 == null ? "" : data.制单日期

 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue

@@ -149,7 +149,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
          @click="set_CheckBill(2, form = rowForm)">返审核</el-button>
          @click="set_CheckBill(2, form = rowForm)">反审核</el-button>
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>

 src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue

@@ -92,6 +92,16 @@
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="子单据类型" prop="HBillSubType">
                <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                  <el-option label="发货" value="发货"></el-option>
                  <el-option label="客返" value="客返"></el-option>
                  <el-option label="供应商租借" value="供应商租借"></el-option>
                  <el-option label="供应商返还" value="供应商返还"></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
@@ -338,6 +348,7 @@
      hSupTypeList: [{name:'供应商',id:1,},{name:'客户',id:2},{name:'车间部门',id:3}],
      HSourceBillTypes:[],
      addBtnShow: false,
      HBillSubType: '',
      zbIndex: null,
      zbSelForm: {},//子表选中数据
      dialogTypeNum: null,//部门弹窗1，仓库弹窗2
@@ -415,6 +426,9 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
@@ -717,6 +731,7 @@
        HDate: new Date(),
        HStockOrgID:sessionStorage["OrganizationID"] - 0,
        HSupTypeID:1,
        HBillSubType: '',
        HSupName:'',
        HSupID:0,
        HDeptName: '',
@@ -946,6 +961,7 @@
                , "HExplanation": data.摘要
                , "HRemark": data.表头备注
                , "HStockOrgID": data.HStockOrgID
                , "HBillSubType": data.子单据类型
                
                , "HMaker": data.制单人
                , "HMakeDate": data.制单日期 == null ? "" : data.制单日期

 src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue

@@ -153,7 +153,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
          @click="set_CheckBill(2, form = rowForm)">返审核</el-button>
          @click="set_CheckBill(2, form = rowForm)">反审核</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
@@ -161,7 +161,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="multiple"
          @click="set_CheckBillAll(2, ids)">返审核(批量)</el-button>
          @click="set_CheckBillAll(2, ids)">反审核(批量)</el-button>
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>

 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue

@@ -114,6 +114,16 @@
                <el-input v-model="form.HInnerBillNo" placeholder="请输入" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="子单据类型" prop="HBillSubType">
                <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                  <el-option label="发货" value="发货"></el-option>
                  <el-option label="客返" value="客返"></el-option>
                  <el-option label="供应商租借" value="供应商租借"></el-option>
                  <el-option label="供应商返还" value="供应商返还"></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="12">
@@ -404,6 +414,7 @@
      HModName: "Sc_MouldProdBackBillEdit",
      formShow: false,
      temp: undefined,
      HBillSubType: '',
      formLoading: true,
      zzSelDis: false,
      rowHideShow: false,
@@ -489,6 +500,9 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
@@ -598,6 +612,7 @@
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
      this.form.HBillSubType = data.HBillSubType
      this.ifOrganizationEdit = true
      console.log(dataArray)
      //子表  赋值
@@ -792,6 +807,7 @@
        HInterID: 0,
        HDate: new Date(),
        HStockOrgID:sessionStorage["OrganizationID"] - 0,
        HBillSubType:'',
        HSupTypeID: 1,
        HSupName:'',
        HSupID:0,
@@ -1065,6 +1081,7 @@
                , "HChecker": data[0].审核人
                , "HCloseMan": data[0].关闭人
                , "HUpDater": data[0].修改人
                ,"HBillSubType": data[0].子单据类型
                , "HDeleteMan": data[0].作废人
                , "HMakeDate": data[0].制单日期 == null ? "" : data[0].制单日期
                , "HCheckDate": data[0].审核日期 == null ? "" : data[0].审核日期
@@ -1261,10 +1278,12 @@
            }else if(!item.HWHID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：调入仓库未选择！");
            }else if(!item.HUnitID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            }else if(item.HQty == 0){
            }
            // else if(!item.HUnitID){
            //   fhck = true
            //   this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            // }
            else if(item.HQty == 0){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：数量不能为0！");
            }

 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue

@@ -56,6 +56,14 @@
                </el-select>
              </el-form-item>
            </el-col>
              <el-form-item label="子单据类型" prop="HBillSubType">
              <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                <el-option label="发货" value="发货"></el-option>
                <el-option label="客返" value="客返"></el-option>
                <el-option label="供应商租借" value="供应商租借"></el-option>
                <el-option label="供应商返还" value="供应商返还"></el-option>
              </el-select>
            </el-form-item>
          </el-row>
          <el-row>
            <el-col :span="6">
@@ -447,6 +455,7 @@
      zzSelDis: false,
      rowHideShow: false,
      openRowHide: false,
      HBillSubType: '',
      hSupTypeList: [{name:'供应商',id:1,},{name:'客户',id:2},{name:'车间部门',id:3}],
      HSourceBillTypes:[],
      addBtnShow: false,
@@ -532,6 +541,9 @@
        ],
        HStockOutOrgID: [
          { required: true, message: "调出组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
@@ -647,6 +659,7 @@
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOutOrgID
      this.form.HBillSubType = data.HBillSubType
      this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
      this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
      this.ifOrganizationEdit = true
@@ -952,6 +965,7 @@
        HSupName:'',
        HSupID:0,
        HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
        HBillSubType: '',
        HDeptName: '',
        HDeptID: 0,
        HWHName:'',
@@ -1137,6 +1151,7 @@
                , "HInnerBillNo": data[0].内部单据号
                , "HStockInOrgID": data[0].HStockInOrgID
                , "HStockOutOrgID": data[0].HStockOutOrgID
                , "HBillSubType": data[0].子单据类型
                , "HMaker": data[0].制单人
                , "HChecker": data[0].审核人
                , "HCloseMan": data[0].关闭人
@@ -1341,10 +1356,12 @@
            }else if(!item.HSCWHID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：调出仓库未选择！");
            }else if(!item.HUnitID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            }else if(item.HQty == 0){
            }
            // else if(!item.HUnitID){
            //   fhck = true
            //   this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            // }
            else if(item.HQty == 0){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：数量不能为0！");
            }

 src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue

@@ -123,10 +123,10 @@
      </el-collapse>
    </el-form>
    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
      <el-col :span="1.5">
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
          id="btn-Add">新增</el-button>
      </el-col>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
@@ -145,7 +145,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
          @click="set_CheckBill(2, form = rowForm)">返审核</el-button>
          @click="set_CheckBill(2, form = rowForm)">反审核</el-button>
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>

 src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue

@@ -114,6 +114,16 @@
                <el-input v-model="form.HInnerBillNo" placeholder="请输入" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item v-show="HIsShow" label="子单据类型" prop="HBillSubType">
                <el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
                  <el-option label="发货" value="发货"></el-option>
                  <el-option label="客返" value="客返"></el-option>
                  <el-option label="供应商租借" value="供应商租借"></el-option>
                  <el-option label="供应商返还" value="供应商返还"></el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="12">
@@ -409,6 +419,7 @@
      formShow: false,
      temp: undefined,
      formLoading: true,
      HBillSubType: '',
      zzSelDis: false,
      rowHideShow: false,
      openRowHide: false,
@@ -493,6 +504,9 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HBillSubType: [
          { required: true, message: "子单据类型不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
@@ -601,6 +615,7 @@
      this.form.HSecManagerName = data.HSecManagerName
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HBillSubType = data.HBillSubType
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
      this.ifOrganizationEdit = true
      //子表  赋值
@@ -796,6 +811,7 @@
        HDate: new Date(),
        HStockOrgID:sessionStorage["OrganizationID"] - 0,
        HSupTypeID: 1,
        HBillSubType: '',
        HSupName:'',
        HSupID:0,
        HDeptName: '',
@@ -978,6 +994,7 @@
                , "HRemark": data[0].表头备注
                , "HInnerBillNo": data[0].内部单据号
                , "HStockOrgID": data[0].HMainStockOrgID
                , "HBillSubType": data[0].子单据类型
                , "HMaker": data[0].制单人
                , "HChecker": data[0].审核人
                , "HCloseMan": data[0].关闭人
@@ -1261,10 +1278,12 @@
            }else if(!item.HWHID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：调入仓库未选择！");
            }else if(!item.HUnitID){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            }else if(item.HQty == 0){
            }
            // else if(!item.HUnitID){
            //   fhck = true
            //   this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
            // }
            else if(item.HQty == 0){
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：数量不能为0！");
            }

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue

@@ -83,7 +83,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="标准包装数">
                    <el-form-item label="数量/箱">
                        <el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
                    </el-form-item>
                </el-col>

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue

@@ -83,7 +83,7 @@
                    </el-form-item>
                </el-col>
                <el-col :span="6">
                    <el-form-item label="标准包装数">
                    <el-form-item label="数量/箱">
                        <el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
                    </el-form-item>
                </el-col>