Merge remote-tracking branch 'origin/master'

zkqy-ui/src/api/supplier/supplier.js

@@ -15,10 +15,11 @@ export function getListSupplier() {
  * 查询物料信息
  * @returns {*}
  */
-export function getListMateriel() {
+export function getListMateriel(data) {
   return request({
     url: '/system/materiel/getList',
     method: 'get',
+    params: data
   })
 }
 
@@ -26,7 +27,7 @@ export function addPurchase(data) {
   return request({
     url: '/business/purchase',
     method: 'POST',
-    data:data
+    data: data
   })
 }
 
@@ -35,7 +36,7 @@ export function getPurchaseInfos(id) {
     //url: '/business/purchase/list/getInfoEdit',
     url: '/business/purchase/list/getInfoEditPurchaseId',
     method: 'get',
-    params: {"PurchaseId":id}
+    params: { "PurchaseId": id }
   })
 }
 
@@ -43,7 +44,7 @@ export function updatePurchase(data) {
   return request({
     url: '/business/purchase/list/updatePurchase',
     method: 'POST',
-    data:data
+    data: data
   })
 }
 

zkqy-ui/src/views/bussiness/OAMange.vue

@@ -102,7 +102,7 @@
               <el-button
                 v-show="scope.row.bepTaskProcessState != 3"
                 class="mr5 mb5"
-                @click="approveHandler(scope.row)"
+                @click="approveHandlerTemp(scope.row)"
                 type="primary"
                 size="small"
                 >审批</el-button
@@ -177,10 +177,14 @@
         <el-dialog title="审批" :visible.sync="show">
           <!-- <FormGroup ref="formGroupRef" :formList="formList"></FormGroup> -->
           <Approve
+            v-show="!times"
             ref="approveRef"
             :formList="formList"
             :nodeLogList="nodeLogList"
           ></Approve>
+          <div v-show="times" class="times">
+            <i class="el-icon-loading" style="font-size: 30px"></i>
+          </div>
           <template #footer>
             <span>
               <el-button @click="show = false">取消</el-button>
@@ -221,6 +225,7 @@ export default {
   dicts: ["bpm_type", "task_process_state"],
   data() {
     return {
+      times: 2, //多次请求  表单组数据回显异常处理
       // 弹窗表单数据
       row: {},
       formList: [],
@@ -340,6 +345,10 @@ export default {
     this.getList();
   },
   methods: {
+    approveHandlerTemp(row) {
+      this.times = 2;
+      this.approveHandler(row);
+    },
     // 审批回调
     async approveHandler(row) {
       console.log(row);
@@ -363,6 +372,21 @@ export default {
         taskPlanKey: bepTaskPlanKey,
       };
       let res = await getProcessNodeFormTemplate(payLoad);
+      this.handlerFormData(res, row);
+      // if (res.code == 200 && res.data[0]?.template?.mainForm) {
+      //   this.times--;
+      //   if (this.times) {
+      //     setTimeout(() => {
+      //       this.handlerFormData(res, row);
+      //     }, 1000);
+      //   }
+      // }
+      // setTimeout(() => {
+      //   this.handlerFormData(res, row);
+      // }, 1000);
+    },
+    // 处理表单数据
+    handlerFormData(res, row) {
       if (res.code == 200) {
         if (res.data[0]?.template?.mainForm) {
           //表单组
@@ -370,13 +394,23 @@ export default {
           this.tableName =
             res.data[0].template.mainForm.showTemplate.dfTableName;
           console.log(this.formList);
+          this.nodeLogList = row.nodeLog.slice(1);
+          this.show = true;
+          this.times--;
+          if (this.times) {
+            this.$nextTick(() => {
+              setTimeout(() => {
+                console.log(1111);
+                this.approveHandler(row);
+              }, 1000);
+            });
+          }
         } else {
           this.formList = res.data;
           this.tableName = res.data[0].template.dfTableName;
+          this.nodeLogList = row.nodeLog.slice(1);
+          this.show = true;
         }
-
-        this.nodeLogList = row.nodeLog.slice(1);
-        this.show = true;
       } else {
         this.$message.error("网络异常,请稍后再试");
       }

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

@@ -174,7 +174,7 @@
       <el-table-column label="计算类型" align="center" prop="calculationType" />
       <el-table-column label="审核意见" align="center" prop="auditOpinion" /> -->
         <el-table-column label="客户名称" align="center" prop="customerName" />
-        <el-table-column label="状态" align="center" prop="status" />
+        <!-- <el-table-column label="状态" align="center" prop="status" /> -->
 
         <!-- <el-table-column label="销售单合同号" align="center" prop="saleOrderNo" />
       <el-table-column label="备注" align="center" prop="remark" /> -->

zkqy-ui/src/views/orderMange/approve.vue

@@ -1128,6 +1128,7 @@ export default {
         let customData = this.customerOptions.find(
           (item) => item.customNo == saleCustomNo
         );
+        let payType = this.getDictLabel(salePayType, "payment_method"); //付款方式
         let customerName = customData ? customData.customName : "";
         let customAddress = customData?.customAddress || "无";
         let customCountryType = customData?.customCountryType || "";
@@ -1235,13 +1236,13 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${salePayType}</td>
+            <td colspan="4">付款方式：${payType}</td>
             <td colspan="4">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="8">付款方式：${salePayType}</td>
+              <td colspan="8">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">

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

@@ -48,10 +48,10 @@
             icon="el-icon-search"
             size="mini"
             @click="handleQuery"
-            >搜索
+          >搜索
           </el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置
+          >重置
           </el-button>
         </el-form-item>
       </el-form>
@@ -65,7 +65,7 @@
             size="mini"
             @click="printHandler"
             v-hasPermi="['system:productCodeList:add']"
-            >打印
+          >打印
           </el-button>
         </el-col>
         <!-- <el-col :span="1.5">
@@ -89,7 +89,7 @@
             :disabled="multiple"
             @click="handleDelete"
             v-hasPermi="['system:productCodeList:remove']"
-            >删除
+          >删除
           </el-button>
         </el-col>
         <el-col :span="1.5">
@@ -100,7 +100,7 @@
             size="mini"
             @click="handleExport"
             v-hasPermi="['system:productCodeList:export']"
-            >导出
+          >导出
           </el-button>
         </el-col>
         <right-toolbar
@@ -114,22 +114,22 @@
         :data="productCodeListList"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="码单号" align="center" prop="qrCode" />
-        <el-table-column label="品名" align="center" prop="productName" />
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="码单号" align="center" prop="qrCode"/>
+        <el-table-column label="品名" align="center" prop="productName"/>
         <el-table-column
           label="规格"
           align="center"
           prop="productSpecifications"
         />
-        <el-table-column label="批号" align="center" prop="lotNum" />
-        <el-table-column label="色泽" align="center" prop="productColor" />
+        <el-table-column label="批号" align="center" prop="lotNum"/>
+        <el-table-column label="色泽" align="center" prop="productColor"/>
         <!-- <el-table-column label="货品编号" align="center" prop="productId" /> -->
-        <el-table-column label="等级" align="center" prop="levels" />
-        <el-table-column label="筒数" align="center" prop="totalCanisterNum" />
-        <el-table-column label="箱数" align="center" prop="totalBoxNum" />
-        <el-table-column label="净重" align="center" prop="totalSuttle" />
-        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="等级" align="center" prop="levels"/>
+        <el-table-column label="筒数" align="center" prop="totalCanisterNum"/>
+        <el-table-column label="箱数" align="center" prop="totalBoxNum"/>
+        <el-table-column label="净重" align="center" prop="totalSuttle"/>
+        <el-table-column label="备注" align="center" prop="remark"/>
         <el-table-column
           label="操作"
           align="center"
@@ -148,7 +148,7 @@
                     icon="el-icon-edit"
                     @click="handleUpdate(scope.row)"
                     v-hasPermi="['system:productCodeList:edit']"
-                    >修改
+                  >修改
                   </el-button>
                 </el-dropdown-item>
                 <el-dropdown-item>
@@ -157,7 +157,7 @@
                     type="text"
                     icon="el-icon-circle-plus-outline"
                     @click="supplementCode(scope.row)"
-                    >补码
+                  >补码
                   </el-button>
                 </el-dropdown-item>
                 <el-dropdown-item>
@@ -167,7 +167,7 @@
                     icon="el-icon-delete"
                     @click="handleDelete(scope.row)"
                     v-hasPermi="['system:productCodeList:remove']"
-                    >删除
+                  >删除
                   </el-button>
                 </el-dropdown-item>
               </el-dropdown-menu>
@@ -193,25 +193,25 @@
       >
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="码单号" prop="qrCode">
-            <el-input v-model="form.qrCode" placeholder="请输入码单号" />
+            <el-input v-model="form.qrCode" placeholder="请输入码单号"/>
           </el-form-item>
           <el-form-item label="批号" prop="lotNum">
-            <el-input v-model="form.lotNum" placeholder="请输入批号" />
+            <el-input v-model="form.lotNum" placeholder="请输入批号"/>
           </el-form-item>
           <el-form-item label="货品编号" prop="productId">
-            <el-input v-model="form.productId" placeholder="请输入货品编号" />
+            <el-input v-model="form.productId" placeholder="请输入货品编号"/>
           </el-form-item>
           <el-form-item label="等级" prop="levels">
-            <el-input v-model="form.levels" placeholder="请输入等级" />
+            <el-input v-model="form.levels" placeholder="请输入等级"/>
           </el-form-item>
           <el-form-item label="筒数" prop="canisterNum">
-            <el-input v-model="form.canisterNum" placeholder="请输入筒数" />
+            <el-input v-model="form.canisterNum" placeholder="请输入筒数"/>
           </el-form-item>
           <el-form-item label="箱数" prop="boxNum">
-            <el-input v-model="form.boxNum" placeholder="请输入箱数" />
+            <el-input v-model="form.boxNum" placeholder="请输入箱数"/>
           </el-form-item>
           <el-form-item label="净重" prop="suttle">
-            <el-input v-model="form.suttle" placeholder="请输入净重" />
+            <el-input v-model="form.suttle" placeholder="请输入净重"/>
           </el-form-item>
           <el-form-item label="生产日期" prop="productionDate">
             <el-date-picker
@@ -224,16 +224,16 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="机台" prop="machineTool">
-            <el-input v-model="form.machineTool" placeholder="请输入机台" />
+            <el-input v-model="form.machineTool" placeholder="请输入机台"/>
           </el-form-item>
           <el-form-item label="毛重" prop="grossWeight">
-            <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
+            <el-input v-model="form.grossWeight" placeholder="请输入毛重"/>
           </el-form-item>
           <el-form-item label="包装" prop="packaging">
-            <el-input v-model="form.packaging" placeholder="请输入包装" />
+            <el-input v-model="form.packaging" placeholder="请输入包装"/>
           </el-form-item>
           <el-form-item label="班次" prop="workShifts">
-            <el-input v-model="form.workShifts" placeholder="请输入班次" />
+            <el-input v-model="form.workShifts" placeholder="请输入班次"/>
           </el-form-item>
           <el-form-item label="外贸号" prop="foreignTradeNumber">
             <el-input
@@ -242,22 +242,22 @@
             />
           </el-form-item>
           <el-form-item label="筒重" prop="canisterWeight">
-            <el-input v-model="form.canisterWeight" placeholder="请输入筒重" />
+            <el-input v-model="form.canisterWeight" placeholder="请输入筒重"/>
           </el-form-item>
           <el-form-item label="箱重/车重" prop="boxWeight">
-            <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重" />
+            <el-input v-model="form.boxWeight" placeholder="请输入箱重/车重"/>
           </el-form-item>
           <el-form-item label="管色" prop="tubeColor">
-            <el-input v-model="form.tubeColor" placeholder="请输入管色" />
+            <el-input v-model="form.tubeColor" placeholder="请输入管色"/>
           </el-form-item>
           <el-form-item label="端口" prop="comPort">
-            <el-input v-model="form.comPort" placeholder="请输入端口" />
+            <el-input v-model="form.comPort" placeholder="请输入端口"/>
           </el-form-item>
           <el-form-item label="打印格式" prop="printFormat">
-            <el-input v-model="form.printFormat" placeholder="请输入打印格式" />
+            <el-input v-model="form.printFormat" placeholder="请输入打印格式"/>
           </el-form-item>
           <el-form-item label="库位" prop="storageLocation">
-            <el-input v-model="form.storageLocation" placeholder="请输入库位" />
+            <el-input v-model="form.storageLocation" placeholder="请输入库位"/>
           </el-form-item>
           <el-form-item label="区域编号" prop="warehouseregionId">
             <el-input
@@ -273,7 +273,7 @@
             />
           </el-form-item>
           <el-form-item label="删除标志" prop="delFlag">
-            <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
+            <el-input v-model="form.delFlag" placeholder="请输入删除标志"/>
           </el-form-item>
           <el-form-item label="创建者编号" prop="createById">
             <el-input
@@ -316,7 +316,7 @@
                     type="primary"
                     size="mini"
                     @click="updateOrderData"
-                    >保存修改
+                  >保存修改
                   </el-button>
                   <!-- <el-button
                     :disabled="tableData.length != 1"
@@ -341,14 +341,14 @@
                   >
                   </el-switch>
                   <el-button type="primary" size="mini" @click="readStateChange"
-                    >{{ isStartReadNum ? "停止读数" : "开始读数" }}
+                  >{{ isStartReadNum ? "停止读数" : "开始读数" }}
                   </el-button>
                   <el-button
                     v-show="!printAuto"
                     type="success"
                     size="mini"
                     @click="printBtnHandler"
-                    >打印
+                  >打印
                   </el-button>
                 </div>
                 <div class="weightWrap" v-show="excuteType == 1">
@@ -426,7 +426,7 @@
                     size="mini"
                     :disabled="chooseState"
                     @click="handleSaveOne(scope.row)"
-                    >保存修改
+                  >保存修改
                   </el-button>
                   <el-button
                     v-else-if="excuteType == 3"
@@ -434,7 +434,7 @@
                     size="mini"
                     :disabled="chooseState"
                     @click="handleSuppleOne(scope.row)"
-                    >打印
+                  >打印
                   </el-button>
 
                   <el-button
@@ -443,7 +443,7 @@
                     size="mini"
                     :disabled="chooseState"
                     @click="handleDeleteOne(scope.$index)"
-                    >删除
+                  >删除
                   </el-button>
                 </template>
               </el-table-column>
@@ -679,7 +679,6 @@
                     <el-input
                       v-model="form.grossWeight"
                       @input="changeGrossWeightForm"
-                      oninput="value=value.replace(/[^0-9.]/g,'')"
                       size="mini"
                       clearable
                     ></el-input>
@@ -791,8 +790,8 @@ import {
   getPrintDataNew,
 } from "@/api/codeListManage/productCodeList";
 import codeListPrint from "@/utils/print/codeListPrint";
-import { getServerPrintData } from "@/utils/print/printUtils";
-import { v4 as uuidv4 } from "uuid";
+import {getServerPrintData} from "@/utils/print/printUtils";
+import {v4 as uuidv4} from "uuid";
 
 export default {
   name: "ProductCodeList",
@@ -863,36 +862,36 @@ export default {
       },
       rules: {
         grossWeight: [
-          { required: true, message: "请输入重量", trigger: "change" },
+          {required: true, message: "请输入重量", trigger: "change"},
         ],
         packaging: [
-          { required: true, message: "请选择包装", trigger: "change" },
+          {required: true, message: "请选择包装", trigger: "change"},
         ],
         machineTool: [
-          { required: true, message: "请选择机台", trigger: "change" },
+          {required: true, message: "请选择机台", trigger: "change"},
         ],
         workShifts: [
-          { required: true, message: "请选择班次", trigger: "change" },
+          {required: true, message: "请选择班次", trigger: "change"},
         ],
         productionDate: [
-          { required: true, message: "请选择生产日期", trigger: "change" },
+          {required: true, message: "请选择生产日期", trigger: "change"},
         ],
-        levels: [{ required: true, message: "请选择等级", trigger: "change" }],
+        levels: [{required: true, message: "请选择等级", trigger: "change"}],
         // foreignTradeNumber: [
         //   { required: true, message: "请输入外贸号", trigger: "blur" },
         // ],
         canisterWeight: [
-          { required: true, message: "请选择筒重", trigger: "change" },
+          {required: true, message: "请选择筒重", trigger: "change"},
         ],
         boxWeight: [
-          { required: true, message: "请选择箱重/车重", trigger: "change" },
+          {required: true, message: "请选择箱重/车重", trigger: "change"},
         ],
         tubeColor: [
-          { required: true, message: "请选择管色", trigger: "change" },
+          {required: true, message: "请选择管色", trigger: "change"},
         ],
-        comPort: [{ required: true, message: "请选择端口", trigger: "change" }],
+        comPort: [{required: true, message: "请选择端口", trigger: "change"}],
         printFormat: [
-          { required: true, message: "请选择格式", trigger: "change" },
+          {required: true, message: "请选择格式", trigger: "change"},
         ],
       },
       dropDownData: {},
@@ -977,7 +976,6 @@ export default {
             this.count.sumCanisterNum += Number(item.canisterNum);
           }
           if (item.suttle) {
-            console.log(Number(item.suttle));
             this.count.sumSuttle += Number(item.suttle);
           }
           if (item.grossWeight) {
@@ -1032,12 +1030,24 @@ export default {
     initWebSocket() {
       // console.log("开始连接ws", process.env.VUE_APP_BASE_WS_API);
       let automatis_printing = this.dict.type.automatic_printing;
-      let frequency = automatis_printing.find(
+      let frequency = automatis_printing.find( // 等到稳定次数
         (item) => item.label == "frequency"
       )?.value;
       if (frequency == undefined) {
         frequency = 30;
       }
+      let minimumWeight = automatis_printing.find( // 打印最小值
+        (item) => item.label == "minimumWeight"
+      )?.value;
+      if (minimumWeight == undefined) {
+        minimumWeight = 5;
+      }
+      let antishake = automatis_printing.find(  // 防抖
+        (item) => item.label == "antishake"
+      )?.value;
+      if (antishake == undefined) {
+        antishake = 3;
+      }
       const wsUrl = "ws:" + process.env.VUE_APP_BASE_WS_API + "/currentWeight";
       this.websocket = new WebSocket(wsUrl);
       this.websocket.addEventListener("open", (event) => {
@@ -1046,7 +1056,7 @@ export default {
         this.$message.success("已开启读数");
       });
       let initialWeight = null; // 初始化基准重量
-      const weightChangeThreshold = 0.001; // 定义重量变化阈值x
+      const weightChangeThreshold = antishake; // 定义重量变化阈值x
       let shouldPrint = false; // 用于控制是否应该打印
       this.websocket.addEventListener("message", async (event) => {
         console.log(event);
@@ -1061,12 +1071,17 @@ export default {
           return;
         }
 
+        if (weight <= minimumWeight) {
+          this.resetWeightStatus();
+          shouldPrint = false; // 重量未满足打印条件，重置打印标志
+          return;
+        }
+
         if (initialWeight === null) {
           initialWeight = weight;
           shouldPrint = true; // 第一次有效重量，允许打印
           return;
         }
-
         const weightDifference = Math.abs(weight - initialWeight);
         if (weightDifference > weightChangeThreshold) {
           initialWeight = weight;
@@ -1079,8 +1094,6 @@ export default {
             this.waiting = 0;
             shouldPrint = false; // 打印后禁止下一次打印，直到重量再次变化
             const isValidate = await this.validateAndPrint(weight);
-
-            console.log("isValidate", isValidate);
           }
         }
       });
@@ -1267,7 +1280,7 @@ export default {
     // 毛重改变回调
     changeGrossWeight(row) {
       console.log(row);
-      let { boxWeight, grossWeight, canisterWeight, canisterNum } = row;
+      let {boxWeight, grossWeight, canisterWeight, canisterNum} = row;
       if (!Number(grossWeight)) {
         row.suttle = 0;
         return;
@@ -1291,7 +1304,7 @@ export default {
     // 确认保存修改一条数据
     async handleSaveOne(row) {
       try {
-        let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
+        let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
           this.count;
         let rowData = JSON.parse(JSON.stringify(row));
         let payLoad = {
@@ -1373,7 +1386,7 @@ export default {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
           try {
-            let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
+            let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
               this.count;
             let rowData = newData.machineTool
               ? JSON.parse(JSON.stringify(newData))
@@ -1430,7 +1443,7 @@ export default {
       this.$refs.form.validate(async (valid) => {
         if (valid) {
           try {
-            let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
+            let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
               this.count;
             let rowData = JSON.parse(JSON.stringify(this.tableData[0]));
             this.printTableData = [rowData];
@@ -1574,7 +1587,7 @@ export default {
     },
     // 计算净重
     getSuttle() {
-      let { boxWeight, canisterWeight, canisterNum } = this.form;
+      let {boxWeight, canisterWeight, canisterNum} = this.form;
       return (Number(boxWeight) - canisterWeight * canisterNum).toFixed(2);
     },
     // 表格点击回调
@@ -1617,7 +1630,7 @@ export default {
             this.$refs.form.validate(async (valid) => {
               if (valid) {
                 try {
-                  let { sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight } =
+                  let {sumBoxNum, sumCanisterNum, sumSuttle, sumGrossWeight} =
                     this.count;
                   let rowData = JSON.parse(JSON.stringify(row));
                   this.printTableData = [rowData];
@@ -1697,7 +1710,8 @@ export default {
         if (res.code == 200) {
           this.dropDownData = res.data;
         }
-      } catch (error) {}
+      } catch (error) {
+      }
     },
     /** 查询产品码单列表 */
     getList() {
@@ -1897,7 +1911,8 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     /** 导出按钮操作 */
     handleExport() {

zkqy-ui/src/views/orderMange/financeApprove.vue

@@ -648,6 +648,10 @@ export default {
         let customData = this.customerOptions.find(
           (item) => item.customNo == saleCustomNo
         );
+        let payType = this.getDictLabel(
+          salePayType,
+          this.dict.type.payment_method
+        ); //付款方式
         let customerName = customData ? customData.customName : "";
         let customAddress = customData?.customAddress || "无";
         let customCountryType = customData?.customCountryType || "";
@@ -754,13 +758,13 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${salePayType}</td>
+            <td colspan="4">付款方式：${payType}</td>
             <td colspan="3">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="7">付款方式：${salePayType}</td>
+              <td colspan="7">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">

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

@@ -173,9 +173,9 @@
       <el-table-column label="计算类型" align="center" prop="calculationType" />
       <el-table-column label="审核意见" align="center" prop="auditOpinion" /> -->
       <el-table-column label="客户名称" align="center" prop="customerName" />
-      <el-table-column label="状态" align="center" prop="status">
+      <!-- <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">{{ scope.row.status }}</template>
-      </el-table-column>
+      </el-table-column> -->
 
       <!-- <el-table-column label="销售单合同号" align="center" prop="saleOrderNo" />
       <el-table-column label="备注" align="center" prop="remark" /> -->

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

@@ -1350,8 +1350,8 @@ export default {
               btnName: "打印出库单",
               btnType: "printOutBound",
               btnIcon: "",
-              // btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
-              btnShowCondition: "[]",
+              btnShowCondition:
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -1359,8 +1359,9 @@ export default {
               btnName: "出库发货",
               btnType: "deliver",
               btnIcon: "",
-              btnShowCondition: "[]",
-              // btnShowCondition:'[{"fieldName":"sale_order.status","mark":"6","refValue":"5"}]',
+              // btnShowCondition: "[]",
+              btnShowCondition:
+                '[{"fieldName":"sale_order.status","mark":"3","refValue":"1"},{"fieldName":"sale_order.status","mark":"3","refValue":"2"}]',
               btnHasPermi: "huaxian:xsglddgl:INSERT",
               children: [],
             },
@@ -2805,6 +2806,7 @@ export default {
         let customData = this.customerOptions.find(
           (item) => item.customNo == saleCustomNo
         );
+        let payType = this.getDictLabel(salePayType, "payment_method"); //付款方式
         let customerName = customData ? customData.customName : "";
         let customAddress = customData?.customAddress || "无";
         let customCountryType = customData?.customCountryType || "";
@@ -2912,13 +2914,13 @@ export default {
           //定金
           printStr += `
           <tr>
-            <td colspan="4">付款方式：${salePayType}</td>
+            <td colspan="4">付款方式：${payType}</td>
             <td colspan="4">定金：${earnestMoney}</td>
           </tr>`;
         } else {
           printStr += `
          <tr>
-              <td colspan="8">付款方式：${salePayType}</td>
+              <td colspan="8">付款方式：${payType}</td>
           </tr>`;
         }
         printStr += `<tr align="center">

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

@@ -293,8 +293,15 @@ export default {
     },
     // 加载表单数据
     async initFormData() {
-      let { id, customerName } = this.leftTableData[this.currentIndex];
+      // let { id, customerName } = this.leftTableData[this.currentIndex];
+      let id = false,
+        customerName;
+      if (this.leftTableData[this.currentIndex]) {
+        id = this.leftTableData[this.currentIndex].id;
+        customerName = this.leftTableData[this.currentIndex].customerName;
+      }
       console.log(this.leftTableData[this.currentIndex]);
+      console.log(id);
       if (!id) {
         //重置表单数据
         Object.assign(this.form, {
@@ -306,6 +313,7 @@ export default {
           truckRegistration: "", //货车信息
           dispatchNoteRemark: "", //备注
           customerName: "", //客户名称
+          deliveryClerk: "", //发货员
           id: "",
         });
         console.log(this.form);

zkqy-ui/src/views/orderMange/purchase/listInfoTwo.vue

@@ -829,7 +829,10 @@ export default {
     },
     //原材料信息
     getListMateriel() {
-      getListMateriel().then((res) => {
+      getListMateriel({
+        isEnablePaging: false,
+        materielSpecies: 1,
+      }).then((res) => {
         this.materiels = res.data;
       });
     },

zkqy-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -267,7 +267,9 @@
             ref="formGroupRef"
             :formList="formList"
           ></FormList>
-
+          <!-- <div v-show="times" class="times">
+            <i class="el-icon-loading" style="font-size: 30px"></i>
+          </div> -->
           <!-- <el-button @click="showValue">test</el-button> -->
         </template>
         <template>