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

陈婷婷

3 天以前 e12d6ed93cff2a302ad45ccfd189ea123d9f4b7f

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/router/index.js

@@ -1057,7 +1057,7 @@
  },
  //#endregion

  //#region 容器领用退库单列表
  //#region 容器入库单列表
  {
    path: "/scMould/warehouse/Sc_MouldProdBackBillList",
    component: Layout,
@@ -1074,13 +1074,13 @@
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
        name: "Sc_MouldProdBackBillList",
        meta: { title: "容器领用退库单维护", activeMenu: "scMould/warehouse" },
        meta: { title: "容器入库单维护", activeMenu: "scMould/warehouse" },
      },
    ],
  },
  //#endregion

  //#region 容器领用退库单
  //#region 容器入库单
  {
    path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
    component: Layout,
@@ -1096,7 +1096,7 @@
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
        name: "Sc_MouldProdBackBillEdit",
        meta: { title: "容器领用退库单编辑", activeMenu: "scMould/warehouse" },
        meta: { title: "容器入库单编辑", activeMenu: "scMould/warehouse" },
      },
    ],
  },

 src/store/modules/permission.js

@@ -1242,7 +1242,7 @@
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器领用退库单维护",
                      title: "容器入库单维护",
                    },
                    component: () =>
                      import(
@@ -1257,7 +1257,7 @@
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "容器领用退库单",
                      title: "容器入库单",
                    },
                    component: () =>
                      import(

 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/scMould/warehouse/Sc_MouldInRequestBillList.vue

@@ -131,13 +131,17 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
       <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
        </el-button>
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-tickets" size="mini"
          @click="handlePush(row = rowForm, OperationType = 4)">下推（容器领用退库单）</el-button>
          @click="handlePush(row = rowForm, OperationType = 4)">下推（容器入库单）</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
@@ -204,7 +208,7 @@
          :copyType="copyType" @editClose="editClose" v-if="editShow" />
      </el-dialog>
      <!-- 下推 -->
      <el-dialog title="下推容器领用退库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
      <el-dialog title="下推容器入库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
         @editClose="pushClose" v-if="pushShow" />
      </el-dialog>
@@ -864,6 +868,51 @@
          });
      }).catch(() => { })
    },
    // 托数变更
     set_PalletChange() {
      if (this.rowList.length !== 1) {
        this.$modal.msgWarning('请选择一行数据进行托数变更！')
        return
      }

      const rowData = this.rowList[0]
      const currentPallet = rowData.托数 || 0

      // 将"请输入新托数"作为输入框的placeholder
      this.$prompt(`当前托数：${currentPallet}`, {
        confirmButtonText: '保存',
        cancelButtonText: '取消',
        inputValue: currentPallet,
        inputType: 'number',
        inputValidator: (value) => {
          if (!value) return '请输入托数！'
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {
        const newPallet = parseInt(value)
        
        return axios.post(this.baseURL + '/Sc_MouldOutRequestBill/UpdatePallet', {
          hmainid: rowData.hmainid,
          newPallet: newPallet,
          operator: sessionStorage["HUserName"]
        })
      }).then(response => {
        if (response.data && response.data.count == 1) {
          this.$modal.msgSuccess('托数变更成功！')
          this.getList()
        } else {
          this.$modal.msgError('错误：' + (response.data.Message || '保存失败'))
        }
      }).catch(error => {
        if (error !== 'cancel') {
          this.$modal.msgError('操作失败：' + error.message)
        }
      })
    },
    // 反审核/审核数据
    set_CheckBill(num, form) {
      var InterID = form.hmainid || form.HInterID

 src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue

@@ -131,6 +131,10 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
        <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
@@ -848,7 +852,7 @@
      this.copyType = 0
    },
    /** 删除按钮操作 */
    handleDelete() {
     handleDelete() {
      this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
        axios.get(this.baseURL + "/Sc_MouldOutRequestBillController/GetSc_MouldOutRequestBill_Delete_Json", {
            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': sessionStorage["HUserName"] }
@@ -864,6 +868,52 @@
          });
      }).catch(() => { })
    },
    
    //托数变更
    set_PalletChange() {
      if (this.rowList.length !== 1) {
        this.$modal.msgWarning('请选择一行数据进行托数变更！')
        return
      }

      const rowData = this.rowList[0]
      const currentPallet = rowData.托数 || 0

      // 将"请输入新托数"作为输入框的placeholder
      this.$prompt(`当前托数：${currentPallet}`, {
        confirmButtonText: '保存',
        cancelButtonText: '取消',
        inputValue: currentPallet,
        inputType: 'number',
        inputValidator: (value) => {
          if (!value) return '请输入托数！'
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {
        const newPallet = parseInt(value)
        
        return axios.post(this.baseURL + '/Sc_MouldOutRequestBillController/UpdatePallet', {
          hmainid: rowData.hmainid,
          newPallet: newPallet,
          operator: sessionStorage["HUserName"]
        })
      }).then(response => {
        if (response.data && response.data.count == 1) {
          this.$modal.msgSuccess('托数变更成功！')
          this.getList()
        } else {
          this.$modal.msgError('错误：' + (response.data.Message || '保存失败'))
        }
      }).catch(error => {
        if (error !== 'cancel') {
          this.$modal.msgError('操作失败：' + error.message)
        }
      })
    },
    // 反审核/审核数据
    set_CheckBill(num, form) {
      var InterID = form.hmainid || form.HInterID

 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue

@@ -7,7 +7,7 @@
      <el-button type="primary" @click="close">退 出</el-button>
      <!-- <el-button @click="cancel">取 消</el-button> -->
    </div>
    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">容器领用退库单</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="90px">
      <el-tabs v-model="activeName" type="card">
        <el-tab-pane label="基本信息" name="first">

 src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue

@@ -131,6 +131,10 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
       <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
@@ -186,8 +190,9 @@
        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose"
          v-if="rowHideShow" />
      </el-dialog>

      <!-- 编辑 -->
      <el-dialog title="编辑容器领用退库单" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
      <el-dialog title="编辑容器入库单" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
        <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
          :copyType="copyType" @editClose="editClose" v-if="editShow" />
      </el-dialog>
@@ -578,6 +583,9 @@
      this.selectedRow = row; // 记录当前选中的行
      this.lastSelectedRowIndex = this.tableData.indexOf(row);
      this.$refs.tableData.toggleRowSelection(row);
      if (this.openPage) {
        this.$emit('deptEmit', this.rowList, this.BillType)
      }
    },
    //选中行高亮样式
    rowStyle({ row, rowIndex }) {
@@ -769,6 +777,52 @@
      this.OperationType = 0
      this.copyType = 0
    },

   //托数变更
    set_PalletChange() {
      if (!this.rowForm || !this.rowForm.hmainid) {
        this.$modal.msgError('请先选择一条记录！')
        return
      }
      
      const rowData = this.rowForm // 使用 rowForm 而不是 rowList
      const currentPallet = rowData.托数 || 0

      // 将"请输入新托数"作为输入框的placeholder
      this.$prompt(`当前托数：${currentPallet}`, {
        confirmButtonText: '保存',
        cancelButtonText: '取消',
        inputValue: currentPallet,
        inputType: 'number',
        inputValidator: (value) => {
          if (!value) return '请输入托数！'
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {
        const newPallet = parseInt(value)
        
        return axios.post(this.baseURL + '/Sc_MouldProdBackBillController/UpdatePallet', {
          hmainid: rowData.hmainid,
          newPallet: newPallet,
          operator: sessionStorage["HUserName"]
        })
      }).then(response => {
        if (response.data && response.data.count == 1) {
          this.$modal.msgSuccess('托数变更成功！')
          this.getList()
        } else {
          this.$modal.msgError('错误：' + (response.data.Message || '保存失败'))
        }
      }).catch(error => {
        if (error !== 'cancel') {
          this.$modal.msgError('操作失败：' + error.message)
        }
      })
    },
    /** 删除按钮操作 */
    handleDelete() {
      this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {

 src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue

@@ -131,6 +131,10 @@
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 2)">编辑</el-button>
      </el-col>
       <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-Pallet" size="mini" :disabled="single" @click="set_PalletChange">托数变更
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
@@ -806,6 +810,51 @@
        this.$modal.msgError("接口请求失败!");
      });
    },

    set_PalletChange() {
      if (!this.rowForm || !this.rowForm.hmainid) {
        this.$modal.msgError('请先选择一条记录！')
        return
      }
      
      const rowData = this.rowForm // 使用 rowForm 而不是 rowList
      const currentPallet = rowData.托数 || 0

      // 将"请输入新托数"作为输入框的placeholder
      this.$prompt(`当前托数：${currentPallet}`, {
        confirmButtonText: '保存',
        cancelButtonText: '取消',
        inputValue: currentPallet,
        inputType: 'number',
        inputValidator: (value) => {
          if (!value) return '请输入托数！'
          const num = parseInt(value)
          if (isNaN(num)) return '请输入有效的数字！'
          if (num.toString() !== value) return '托数不能为小数！'
          if (num <= 0) return '托数必须大于0！'
          return true
        }
      }).then(({ value }) => {
        const newPallet = parseInt(value)
        
        return axios.post(this.baseURL + '/Sc_MouldProdOutBill/UpdatePallet', {
          hmainid: rowData.hmainid,
          newPallet: newPallet,
          operator: sessionStorage["HUserName"]
        })
      }).then(response => {
        if (response.data && response.data.count == 1) {
          this.$modal.msgSuccess('托数变更成功！')
          this.getList()
        } else {
          this.$modal.msgError('错误：' + (response.data.Message || '保存失败'))
        }
      }).catch(error => {
        if (error !== 'cancel') {
          this.$modal.msgError('操作失败：' + error.message)
        }
      })
    },
    //导出
    handleExport() {
      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 将数据转换为工作表

 src/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue

@@ -137,7 +137,7 @@
      </el-col>
      <!-- <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-tickets" size="mini"
          @click="handlePush(row = rowForm, OperationType = 4)">下推（容器领用退库单）</el-button>
          @click="handlePush(row = rowForm, OperationType = 4)">下推（容器入库单）</el-button>
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
@@ -204,7 +204,7 @@
          :copyType="copyType" @editClose="editClose" v-if="editShow" />
      </el-dialog>
      <!-- 下推 -->
      <el-dialog title="下推容器领用退库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
      <el-dialog title="下推容器入库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
        <push :OperationType='4' :propsData='pushData' :HSouceBillType=BillType
         @editClose="pushClose" v-if="pushShow" />
      </el-dialog>

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue

@@ -223,6 +223,7 @@
                ,HPOOrderBillMTO:""                                     //采购跟踪号
                ,HSeOrderBillNo:""                                      //客户订单号
                ,HCusModel:""                                           //产品型号
                ,HMTONo:null                                            //计划跟踪号
                
                ,HOrganizationID:0                                      //组织ID
                ,HOrganization:""                                       //组织名称
@@ -427,6 +428,13 @@
                return Result = false;
            }

            var regex = /^\d{4}-\d{2}-\d{2}$/;                              //正则表达式：校验 yyyy-MM-dd
            temp = this.initMainData.HInspectionDate;
            if(!regex.test(temp)){
                this.$modal.msgError("请设置生产日期！！！");
                return Result = false;
            }

            // var HEndQty = this.initMainData.HEndQty;
            // if (HEndQty == "") {
            //     this.$modal.msgError("尾包数量不能为空！！");
@@ -518,6 +526,7 @@
                    , "HReInspectionDate": this.initMainData.HReInspectionDate
                    , "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
                    , "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
                    , "HMTONo": this.initMainData.HMTONo
                }
            ]

@@ -654,6 +663,7 @@
            this.initMainData.HPOOrderBillMTO = dataArray[0].采购跟踪号;
            this.initMainData.HSeOrderBillNo = dataArray[0].客户订单号;
            this.initMainData.HCusModel = dataArray[0].产品型号;
            this.initMainData.HMTONo = dataArray[0].计划跟踪号;
            this.initMainData.HMinQty = 0;
            if(this.initMainData.HMinQty>0){
                this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue

@@ -222,7 +222,8 @@
                ,HReInspectionDate:null                                 //复检日期
                ,HPOOrderBillMTO:""                                     //采购跟踪号
                ,HSeOrderBillNo:""                                      //客户订单号
                ,HCusModel:""                                       //产品型号
                ,HCusModel:""                                           //产品型号
                ,HMTONo:null                                            //计划跟踪号
                
                ,HOrganizationID:0                                      //组织ID
                ,HOrganization:""                                       //组织名称
@@ -428,6 +429,13 @@
                return Result = false;
            }

            var regex = /^\d{4}-\d{2}-\d{2}$/;                              //正则表达式：校验 yyyy-MM-dd
            temp = this.initMainData.HInspectionDate;
            if(!regex.test(temp)){
                this.$modal.msgError("请设置生产日期！！！");
                return Result = false;
            }

            // var HEndQty = this.initMainData.HEndQty;
            // if (HEndQty == "") {
            //     this.$modal.msgError("尾包数量不能为空！！");
@@ -519,6 +527,7 @@
                    , "HReInspectionDate": this.initMainData.HReInspectionDate
                    , "HPOOrderBillMTO": this.initMainData.HPOOrderBillMTO
                    , "HSeOrderBillNo": this.initMainData.HSeOrderBillNo
                    , "HMTONo": this.initMainData.HMTONo
                }
            ]

@@ -655,6 +664,7 @@
            this.initMainData.HPOOrderBillMTO = dataArray[0].采购跟踪号;
            this.initMainData.HSeOrderBillNo = dataArray[0].客户订单号;
            this.initMainData.HCusModel = dataArray[0].产品型号;
            this.initMainData.HMTONo = dataArray[0].计划跟踪号;
            this.initMainData.HMinQty = 0;
            if(this.initMainData.HMinQty>0){
                this.initMainData.HBQty = (this.initMainData.HQty_SourceBill / this.initMainData.HMinQty) + (this.initMainData.HQty_SourceBill%this.initMainData.HMinQty == 0?0:1);