Merge remote-tracking branch 'origin/master'

zkqy-ui/.env.development

@@ -20,7 +20,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_BASE_API1 = 'http://192.168.110.129:8066/'
 
 # ws地址
-VUE_APP_BASE_WS_API = '//192.168.110.15:8721'
+VUE_APP_BASE_WS_API = '//localhost:8721'
 
 #数据引擎模块IP
 #VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'

zkqy-ui/.env.production

@@ -16,7 +16,7 @@ VUE_APP_BASE_API1 = 'http://192.168.0.17:8066/'
 VUE_APP_BASE_IMG_API = 'http://192.168.0.17:1024/dev-api'
 
 # ws地址
-VUE_APP_BASE_WS_API = '//127.0.0.1:8721'
+VUE_APP_BASE_WS_API = '//localhsot:8721'
 
 
 #数据引擎模块IP

zkqy-ui/src/utils/print/printUtils.js

@@ -71,7 +71,7 @@ function printCN_XSW(printRow) {
     printFormat, /*格式*/
     productName, /*产品名*/
     productSpecifications, /*规格*/
-    productColour, /*色泽*/
+    productColor, /*色泽*/
     lotNum, /*批次*/
     levels,/*等级*/
     directionOfTwist,/*捻向*/
@@ -82,7 +82,7 @@ function printCN_XSW(printRow) {
   } = printRow;
   let res = [];
   res.push({ key1: '品种', key2: productName || '', key3: '规格', key4: productSpecifications || '' })
-  res.push({ key1: '批号', key2: lotNum || '', key3: '色号', key4: productColour || '' })
+  res.push({ key1: '批号', key2: lotNum || '', key3: '色号', key4: productColor || '' })
   res.push({ key1: '等级', key2: levels || '', key3: '箱号', key4: qrCode || '', key5: boxNum || '' })
   res.push({ key1: '筒数', key2: canisterNum || '' + '    ' + tubeColor, key3: '捻向', key4: directionOfTwistLabel || ' ', })
   res.push({
@@ -139,7 +139,7 @@ function printCN_WJZ(printRow) {
 
 // 总码单
 function printCN_ZMD(printRow) {
-  console.log('总码单', printRow);
+  console.log('----------------', printRow);
   let {
     qrCode,/*序号*/
     machineTool,/*机台*/

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -793,14 +793,13 @@ export default {
       firstRowData.id = this.summertId;
       firstRowData.otherStates = 1;
       firstRowData.printFormat = "6"; //打印类型为总码单
-      // firstRowData.boxSumNum = this.tableData.length; //箱子总数
+      firstRowData.boxSumNum = this.tableData.length; //箱子总数
       firstRowData.boxNum = this.tableData.length; //箱子总数
       firstRowData.machineToolNo = this.lineOptions.find(
         (item) => item.id == this.form.machineTool
       ).productionLineNo;
       firstRowData.qrCodeId = uuidv4().slice(0, 8); //生成总码单自己的qrCodeId
       this.printTableData = [firstRowData];
-
       // 保存打印数据
       let payLoad = {
         ...firstRowData,

zkqy-ui/src/views/orderMange/requisitionOrders/index.vue

@@ -169,25 +169,28 @@
     <!-- 添加或修改领料单对话框 -->
     <el-dialog :title="requistionOrdersType?'退料单':'领料单'" :visible.sync="open" width="800px" append-to-body :before-close="cancel">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row :gutter="20">
+        <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="单据类型" prop="requistionOrdersType">
               <el-select v-model="form.requistionOrdersType" filterable placeholder="请选择任务"
-                         :disabled="requistionState" @change="handleRequistionState(form.requistionOrdersType)">
+                         :disabled="isUpdate?true:requistionState?true:false" @change="handleRequistionState(form.requistionOrdersType)">
                 <el-option key="0" label="领料" :value=0></el-option>
                 <el-option key="1" label="退料" :value=1></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="16">
             <el-form-item :label="requistionOrdersType?'退料任务':'领料任务'" prop="taskCode">
-              <el-select v-model="form.taskCode" filterable placeholder="请选择任务" :disabled="requistionState"
-                         @change="handleRequistionState(form.requistionOrdersType)">
-                <el-option v-for="item in taskList" :key="item.saleProductsId" :label="item.saleProductsTaskName"
+              <el-select v-model="form.taskCode" filterable placeholder="请选择任务" :disabled="isUpdate?true:requistionState?true:false"
+                         @change="handleRequistionState(form.requistionOrdersType)" style="width:300px">
+                <el-option v-for="item in taskList" :key="item.saleProductsId" :label="item.saleProductsSaleOrderNo+'-'+item.saleProductsTaskName+'-'+item.saleProductsProductNumber"
                            :value="item.saleProductsId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :span="24">
           <el-col :span="8">
             <el-form-item :label="requistionOrdersType?'退料日期':'领料日期'" prop="requisitionDate">
               <el-date-picker style="width: 100%" v-model="form.requisitionDate" type="date"
@@ -300,6 +303,8 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      //是否是修改弹窗
+      isUpdate:false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -435,6 +440,7 @@ export default {
       // 获取物料信息
       this.getMaterielList();
       this.reset();
+      this.isUpdate=false;
       this.open = true;
       this.title = "添加领料单";
       // 默认领料时间为当前
@@ -449,6 +455,9 @@ export default {
       const id = row.id || this.ids
       // 获取领料任务
       this.getTaskList();
+      // 获取物料信息
+      this.getMaterielList();
+      this.isUpdate=true;
       getRequisitionOrders(id).then(response => {
         this.form = response.data;
         // this.taskList.find(item => {