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

陈婷婷

5 天以前 20a2010108c26803aeef8147dce28436aeac0150

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

 src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue

@@ -375,6 +375,18 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HMangerName: [
          { required: true, message: "主管不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
      }
    };
@@ -389,6 +401,8 @@
      }).then(response => {
        if (response.data.count == 1) {
          this.organizationList = response.data.data;//组织列表
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -743,6 +757,8 @@
          }
          this.formShow = true
          this.formLoading = false
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        console.log(error)

 src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue

@@ -457,6 +457,8 @@
          option.data = data1.data
          this.dataList = option
          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");

 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue

@@ -428,6 +428,18 @@
        ],
        HStockOutOrgID: [
          { required: true, message: "调出组织不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HMangerName: [
          { required: true, message: "主管不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
      }
    };
@@ -442,6 +454,8 @@
      }).then(response => {
        if (response.data.count == 1) {
          this.organizationList = response.data.data;//组织列表
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -826,6 +840,8 @@
          }
          this.formShow = true
          this.formLoading = false
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        console.log(error)

 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue

@@ -447,6 +447,8 @@
          option.data = data1.data
          this.dataList = option
          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");

 src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue

@@ -401,6 +401,18 @@
        ],
        HStockOrgID: [
          { required: true, message: "组织不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HMangerName: [
          { required: true, message: "主管不能为空", trigger: "blur" }
        ],
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
      }
    };
@@ -416,6 +428,8 @@
      }).then(response => {
        if (response.data.count == 1) {
          this.organizationList = response.data.data;//组织列表
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -429,6 +443,8 @@
          this.HSourceBillTypes = response.data.data
          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -834,6 +850,8 @@
          }
          this.formShow = true
          this.formLoading = false
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        console.log(error)

 src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue

@@ -457,6 +457,8 @@
          option.data = data1.data
          this.dataList = option
          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");

 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue

@@ -213,7 +213,7 @@
            <el-table-column align="center" label="序号" type="index" width="80" />
            <el-table-column align="center" label="容器代码" width="120">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HMaterCode" placeholder="请输入" @keyup.native.f7="openDataDialog(8, scope.row)"
                <el-input v-model="scope.row.HMaterNumber" placeholder="请输入" @keyup.native.f7="openDataDialog(8, scope.row)"
                  @dblclick.native="openDataDialog(8, scope.row)" />
              </template>
            </el-table-column>
@@ -250,7 +250,7 @@
            </el-table-column>
            <el-table-column align="center" label="仓库代码" width="120">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HWHCode" placeholder="请输入" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
                <el-input v-model="scope.row.HWHNumber" placeholder="请输入" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
              </template>
            </el-table-column>
@@ -496,6 +496,8 @@
      }).then(response => {
        if (response.data.count == 1) {
          this.organizationList = response.data.data;//组织列表
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -509,6 +511,8 @@
          this.HSourceBillTypes = response.data.data
          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -555,8 +559,8 @@
            }).then(response => { 
                if (response.data.count == 1) { 
                    resolve(response.data.data[0]);
                } else { 
                    this.$modal.msgError("未查询到数据!");
                }else{
                  this.$modal.msgError(response.data.Message);
                }
            }).catch(error => { 
                this.$modal.msgError("接口请求失败!");
@@ -569,6 +573,8 @@
      this.form.HSupTypeID = data.HSupTypeID
      this.form.HSupID = data.HSupID
      this.form.HSupName = data.HSupName
      this.form.HSecManagerId = data.HSecManagerID
      this.form.HSecManagerName = data.HSecManagerName
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
@@ -688,7 +694,7 @@
              this.form.HWHNumber = deptRow.仓库代码
            }else{
              this.editData[this.zbIndex].HWHID = deptRow.HItemID
              this.editData[this.zbIndex].HWHCode = deptRow.仓库代码
              this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
              this.editData[this.zbIndex].HWHName = deptRow.仓库名称
            }
            this.warehouseShow = false
@@ -967,6 +973,8 @@
          }
          this.formShow = true
          this.formLoading = false
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        console.log(error)

 src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue

@@ -129,7 +129,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 3)">编辑</el-button>
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@@ -171,7 +171,7 @@
              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
              <div :style="item.style">
                <span v-if="column.property.includes('日期')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
                  v-else-if="column.property == '单据号'">{{
                    row.单据号
                  }}</el-button>
@@ -256,7 +256,7 @@
      HStatusList: [{name:'全部',value:'-1'},{name:'未审核',value:'0'},{name:'已审核',value:'1'},{name:'已关闭',value:'2'}],
      addBtnShow: false,
      dialogTitle: '',
      OperationType: null,//保存类型（新增1修改3）
      OperationType: null,//保存类型（新增1修改2）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API,
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
@@ -428,6 +428,8 @@
          option.data = data1.data
          this.dataList = option
          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -585,7 +587,7 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3
      this.OperationType = 2
      this.handleEdit(row)
    },
    // 多选框选中数据

 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue

@@ -522,6 +522,9 @@
        HSecManagerName: [
          { required: true, message: "验收员不能为空", trigger: "blur" }
        ],
        HEmpName: [
          { required: true, message: "业务员不能为空", trigger: "blur" }
        ],
        HKeeperName: [
          { required: true, message: "保管员不能为空", trigger: "blur" }
        ]
@@ -539,6 +542,8 @@
      }).then(response => {
        if (response.data.count == 1) {
          this.organizationList = response.data.data;//组织列表
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -552,6 +557,8 @@
          this.HSourceBillTypes = response.data.data
          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -601,8 +608,8 @@
            }).then(response => { 
                if (response.data.count == 1) { 
                    resolve(response.data.data[0]);
                } else { 
                    this.$modal.msgError("未查询到数据!");
                }else{
                  this.$modal.msgError(response.data.Message);
                }
            }).catch(error => { 
                this.$modal.msgError("接口请求失败!");
@@ -798,11 +805,11 @@
          } else if (num == 9){
            if(this.HSPType == 1){
              this.editData[this.zbIndex].HSPID = deptRow.HMainID
              this.editData[this.zbIndex].HSPCode = deptRow.仓位代码
              this.editData[this.zbIndex].HSPNumber = deptRow.仓位代码
              this.editData[this.zbIndex].HSPName = deptRow.仓位名称
            }else{
              this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
              this.editData[this.zbIndex].HSCSPCode = deptRow.仓位代码
              this.editData[this.zbIndex].HSCSPNumber = deptRow.仓位代码
              this.editData[this.zbIndex].HSCSPName = deptRow.仓位名称
            }
            this.gyStockPlaceShow = false
@@ -1042,6 +1049,8 @@
          }
          this.formShow = true
          this.formLoading = false
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        console.log(error)

 src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue

@@ -129,7 +129,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 3)">编辑</el-button>
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@@ -171,7 +171,7 @@
              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
              <div :style="item.style">
                <span v-if="column.property.includes('日期')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
                  v-else-if="column.property == '单据号'">{{
                    row.单据号
                  }}</el-button>
@@ -256,7 +256,7 @@
      HStatusList: [{name:'全部',value:'-1'},{name:'未审核',value:'0'},{name:'已审核',value:'1'},{name:'已关闭',value:'2'}],
      addBtnShow: false,
      dialogTitle: '',
      OperationType: null,//保存类型（新增1修改3）
      OperationType: null,//保存类型（新增1修改2）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API,
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
@@ -359,6 +359,7 @@
      const end = new Date();
      const start = new Date();
      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
      end.setTime(end.getTime() - 3600 * 1000 * 24);
      const yyyyS = start.getFullYear();
      const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 月份是从0开始的
      const ddS = String(start.getDate()).padStart(2, '0');
@@ -427,6 +428,8 @@
          option.data = data1.data
          this.dataList = option
          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -584,7 +587,7 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3
      this.OperationType = 2
      this.handleEdit(row)
    },
    // 多选框选中数据

 src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue

@@ -213,7 +213,7 @@
            <el-table-column align="center" label="序号" type="index" width="80" />
            <el-table-column align="center" label="容器代码" width="120">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HMaterCode" placeholder="请输入" @keyup.native.f7="openDataDialog(8, scope.row)"
                <el-input v-model="scope.row.HMaterNumber" placeholder="请输入" @keyup.native.f7="openDataDialog(8, scope.row)"
                  @dblclick.native="openDataDialog(8, scope.row)" />
              </template>
            </el-table-column>
@@ -250,7 +250,7 @@
            </el-table-column>
            <el-table-column align="center" label="仓库代码" width="120">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HWHCode" placeholder="请输入" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
                <el-input v-model="scope.row.HWHNumber" placeholder="请输入" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
              </template>
            </el-table-column>
@@ -496,6 +496,8 @@
      }).then(response => {
        if (response.data.count == 1) {
          this.organizationList = response.data.data;//组织列表
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -509,6 +511,8 @@
          this.HSourceBillTypes = response.data.data
          this.form.HSourceBillType = this.HSourceBillTypes[0].HSourceBillType
          this.form.HSourceBillTypeName = this.HSourceBillTypes[0].HSourceBillTypeName
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -555,8 +559,8 @@
            }).then(response => { 
                if (response.data.count == 1) { 
                    resolve(response.data.data[0]);
                } else { 
                    this.$modal.msgError("未查询到数据!");
                }else{
                  this.$modal.msgError(response.data.Message);
                }
            }).catch(error => { 
                this.$modal.msgError("接口请求失败!");
@@ -569,6 +573,8 @@
      this.form.HSupTypeID = data.HSupTypeID
      this.form.HSupID = data.HSupID
      this.form.HSupName = data.HSupName
      this.form.HSecManagerId = data.HSecManagerID
      this.form.HSecManagerName = data.HSecManagerName
      this.form.HDeptID = data.HDeptID
      this.form.HDeptName = data.HDeptName
      this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
@@ -688,7 +694,7 @@
              this.form.HWHNumber = deptRow.仓库代码
            }else{
              this.editData[this.zbIndex].HWHID = deptRow.HItemID
              this.editData[this.zbIndex].HWHCode = deptRow.仓库代码
              this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
              this.editData[this.zbIndex].HWHName = deptRow.仓库名称
            }
            this.warehouseShow = false
@@ -966,6 +972,8 @@
          }
          this.formShow = true
          this.formLoading = false
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        console.log(error)

 src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue

@@ -129,7 +129,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 3)">编辑</el-button>
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@@ -171,7 +171,7 @@
              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
              <div :style="item.style">
                <span v-if="column.property.includes('日期')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
                  v-else-if="column.property == '单据号'">{{
                    row.单据号
                  }}</el-button>
@@ -256,7 +256,7 @@
      HStatusList: [{name:'全部',value:'-1'},{name:'未审核',value:'0'},{name:'已审核',value:'1'},{name:'已关闭',value:'2'}],
      addBtnShow: false,
      dialogTitle: '',
      OperationType: null,//保存类型（新增1修改3）
      OperationType: null,//保存类型（新增1修改2）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API,
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
@@ -428,6 +428,8 @@
          this.dataList = option

          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
        }else{
          this.$modal.msgError(response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
@@ -585,7 +587,7 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3
      this.OperationType = 2
      this.handleEdit(row)
    },
    // 多选框选中数据