Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt into dengfei

src/views/bpm/handleTask/components/inquiryManage/addDialog.vue

@@ -67,6 +67,13 @@
     </el-form>
     <headerTitle title="物品清单" style="margin-top: 15px"></headerTitle>
     <el-button type="primary" @click="openSupplier" v-if="!isView">新增供应商</el-button>
+    <el-button
+        type="primary"
+        style="margin-bottom: 10px"
+        @click="supplierSelectAll"
+        v-click-once
+        >批量生成报价单</el-button
+      >
     <inventoryTable
       ref="inventoryTable"
       @delList="delList"
@@ -372,6 +379,13 @@
       changeInquiryManageList(data) {
         this.getplanData(data.id, 'change');
       },
+      supplierSelectAll() {
+        if (!this.$refs.inventoryTable.selection.length)
+          return this.$message.warning('请选择产品');
+        this.$refs.inventoryTable.selection.forEach((item) => {
+          this.supplierSelect(item);
+        });
+      },
       async supplierSelect(row) {
         let supplierIds = Object.keys(this.supplierProducts);
         const promises = [];

src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -52,6 +52,7 @@
           <el-input
             v-model="form.preferentialPrice"
             :disabled="status == 'Detail'"
+            type="number"
           ></el-input>
         </el-form-item>
       </template>
@@ -417,7 +418,7 @@
       fixed: 'left'
     },
     {
-      minWidth: 120,
+      minWidth: 140,
       prop: 'preferentialPrice',
       label: '优惠后总价',
       slot: 'preferentialPrice',

src/views/bpm/handleTask/components/inquiryManage/inventoryTable.vue

@@ -48,7 +48,7 @@
       <template v-slot:add="scope" v-if="status != 'Detail'">
         <el-form-item style="margin-bottom: 20px">
           <el-button type="primary" @click="openSupplier(scope.row)"
-            >新增报价单</el-button
+            >生成报价单</el-button
           >
         </el-form-item>
       </template>

src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

@@ -3,170 +3,123 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <headerTitle title="订单信息"> </headerTitle>
       <el-row>
-        <el-col :span="12">
-          <el-form-item
-            label="订单编号："
-            prop="orderNo"
-            style="margin-bottom: 16px"
-          >
+        <el-col :span="8">
+          <el-form-item label="订单编号：" prop="orderNo">
             {{ form.orderNo }}
           </el-form-item>
-
-          <el-form-item
-            label="项目名称："
-            prop="projectName"
-            style="margin-bottom: 16px"
-          >
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="订单类型：" prop="requireDeptName">
+            {{ form.sourceTypeName }}
+          </el-form-item>
+        </el-col>
+ 
+        <el-col :span="8">
+          <el-form-item label="项目名称：" prop="projectName">
             {{ form.projectName }}
           </el-form-item>
-          <el-form-item
-            label="需求部门："
-            prop="requireDeptName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.requireDeptName }}
+        </el-col>
+        <el-col :span="8" v-if="form.relationType==4">
+          <el-form-item label="合同名称：" prop="contractName">
+            {{ form.contractName }}
           </el-form-item>
-          <el-form-item
-            label="订单类型："
-            prop="requireDeptName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.sourceTypeName }}
+        </el-col>
+        <el-col :span="8" v-if="form.relationType==2">
+          <el-form-item label="采购计划名称：" prop="relationName">
+            {{ form.relationName }}
           </el-form-item>
-
-          <el-form-item prop="orderFiles" label="附件：">
-            <fileMain v-model="form.orderFiles" type="view"></fileMain>
-           
+        </el-col>
+        <el-col :span="8" v-if="form.relationType==1">
+          <el-form-item label="采购需求单：" prop="relationName">
+            {{ form.relationName }}
           </el-form-item>
-
-          <el-form-item prop="remark" label="备注：">
-            {{ form.remark }}
+        </el-col>
+        <el-col :span="8" v-if="form.relationType==3">
+          <el-form-item label="采购核价单：" prop="relationName">
+            {{ form.relationName }}
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="合同名称："
-            prop="contractName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.contractName }}
+        <el-col :span="8">
+          <el-form-item label="需求部门：" prop="requireDeptName">
+            {{ form.requireDeptName }}
           </el-form-item>
-          <el-form-item
-            label="采购计划名称："
-            prop="purchasePlanName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.purchasePlanName }}
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="需求人：" prop="requireUserName">
+            {{ form.requireUserName }}
           </el-form-item>
-
-          <el-form-item
-            label="结算方式："
-            prop="settlementModeName"
-            style="margin-bottom: 16px"
-          >
+        </el-col>
+      
+        <el-col :span="8">
+          <el-form-item label="结算方式：" prop="settlementModeName">
             {{ detailData.settlementModeName }}
           </el-form-item>
-          <el-form-item
-            label="需求人："
-            prop="requireUserName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.requireUserName }}
-          </el-form-item>
-          <el-form-item
-            label="优惠总金额："
-            prop="payAmount"
-            style="margin-bottom: 16px"
-          >
+        </el-col>
+   
+        <el-col :span="8">
+          <el-form-item label="优惠总金额：" prop="payAmount">
             {{ form.payAmount }}元
           </el-form-item>
-          <el-form-item
-            label="订单总金额："
-            prop="totalAmount"
-            style="margin-bottom: 16px"
-          >
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="订单总金额：" prop="totalAmount">
             {{ form.totalAmount }}元
           </el-form-item>
-       
         </el-col>
+        <el-col :span="8">
+            <el-form-item prop="orderFiles" label="附件：">
+              <fileMain v-model="form.orderFiles" type="view"></fileMain>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item prop="remark" label="备注：">
+              {{ form.remark }}
+            </el-form-item>
+          </el-col>
       </el-row>
       <headerTitle title="基本信息"></headerTitle>
       <el-row>
         <el-col :span="12">
-          <el-form-item
-            label="采购方名称："
-            prop="partaName"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="采购方名称：" prop="partaName">
             {{ form.partaName }}
           </el-form-item>
           <el-form-item
             label="采购方统一社会信用代码"
             prop="partaUnifiedSocialCreditCode"
             label-width="170px"
-            style="margin-bottom: 16px"
           >
             {{ form.partaUnifiedSocialCreditCode }}
           </el-form-item>
-          <el-form-item
-            label="采购方联系人："
-            prop="partaLinkName"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="采购方联系人：" prop="partaLinkName">
             {{ form.partaLinkName }}
           </el-form-item>
-          <el-form-item
-            label="采购方电话："
-            prop="partaTel"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="采购方电话：" prop="partaTel">
             {{ form.partaTel }}
           </el-form-item>
-          <el-form-item
-            label="采购方传真："
-            prop="partaFax"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="采购方传真：" prop="partaFax">
             {{ form.partaFax }}
           </el-form-item>
-          <el-form-item
-            label="	采购方Email："
-            prop="partaEmail"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="	采购方Email：" prop="partaEmail">
             {{ form.partaEmail }}
           </el-form-item>
-          <el-form-item
-            label="采购方地址："
-            prop="partaAddress"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="采购方地址：" prop="partaAddress">
             {{ form.partaAddress }}
           </el-form-item>
-
+      
         </el-col>
 
         <el-col :span="12">
-          <el-form-item
-            label="供应商名称："
-            prop="partbName"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="供应商名称：" prop="partbName">
             {{ form.partbName }}
           </el-form-item>
           <el-form-item
             label="供应商统一社会信用代码"
             prop="partbUnifiedSocialCreditCode"
             label-width="180px"
-            style="margin-bottom: 16px"
           >
             {{ form.partbUnifiedSocialCreditCode }}
           </el-form-item>
-          <el-form-item
-            label="供应商联系人："
-            prop="partbLinkName"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="供应商联系人：" prop="partbLinkName">
             {{ form.partbLinkName }}
           </el-form-item>
           <el-form-item
@@ -180,22 +133,13 @@
             {{ form.partbFax }}
           </el-form-item>
 
-          <el-form-item
-            label="供应商Email："
-            prop="partbEmail"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="供应商Email：" prop="partbEmail">
             {{ form.partbEmail }}
           </el-form-item>
 
-          <el-form-item
-            label="供应商地址："
-            prop="partbAddress"
-            style="margin-bottom: 16px"
-          >
+          <el-form-item label="供应商地址：" prop="partbAddress">
             {{ form.partbAddress }}
           </el-form-item>
-      
         </el-col>
       </el-row>
     </el-form>
@@ -267,7 +211,7 @@
   import dictMixins from '@/mixins/dictMixins';
   // import fileMain from '@/components/addDoc/index.vue';
   import { orderSourceType, outsourceSceneList } from '@/enum/dict';
-  import {lbjtList } from '@/enum/dict.js';
+  import { lbjtList } from '@/enum/dict.js';
   import { levelList } from '@/enum/dict.js';
   export default {
     mixins: [dictMixins],
@@ -439,12 +383,13 @@
             label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
-              if(row.produceType){
-                return row.produceType.map(item=>{
-                  return lbjtList[item]
-                }).toString()
+              if (row.produceType) {
+                return row.produceType
+                  .map((item) => {
+                    return lbjtList[item];
+                  })
+                  .toString();
               }
-          
             }
           },
 
@@ -455,7 +400,7 @@
             label: '包装规格',
             showOverflowTooltip: true
           },
-      
+
           {
             width: 120,
             prop: 'singleWeight',
@@ -881,7 +826,7 @@
 <style scoped lang="scss">
   .ele-dialog-form {
     .el-form-item {
-      margin-bottom: 10px;
+      margin-bottom: 5px;
     }
   }
 

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue

@@ -86,7 +86,7 @@
     updateReceiptAPI,
     returnHandleProcessCancel
   } from '@/api/bpm/components/saleManage/saleorder';
-  import {rejectTask,cancelTask} from '@/api/bpm/task';
+  import { rejectTask, cancelTask } from '@/api/bpm/task';
 
   import { listAllUserBind } from '@/api/system/organization';
   import { EventBus } from './eventBus.js';
@@ -379,13 +379,16 @@
         // 获取销售退货入库信息
 
         let storageData = data.returnStorageData;
-        data.detailList.forEach((val, index) => {
-          val.weight = storageData._packingList[index].weight;
-          val.materielDesignation =
-            storageData._packingList[index].materielDesignation;
-          val.clientCode = storageData._packingList[index].clientCode;
-          val.engrave = storageData._packingList[index].engrave;
-        });
+        if (storageData?._packingList?.length) {
+          data.detailList.forEach((val, index) => {
+            val.weight = storageData._packingList[index].weight;
+            val.materielDesignation =
+              storageData._packingList[index].materielDesignation;
+            val.clientCode = storageData._packingList[index].clientCode;
+            val.engrave = storageData._packingList[index].engrave;
+          });
+        }
+
         // 是否已经入库
         // if (storageData.isStorage) {
         //   try {
@@ -452,10 +455,10 @@
         let data = await this.getTableValue();
         let updateCode = '1'; //判断saleReturnUpdateAPI方法是否执行成功
         this.$refs.formRef.validate(async (validate) => {
-          if ((!validate || !data) && !!pass)return
-            // return this.$message.warning('有必填项未填，请检查');
-            // alert(1)
-            // return
+          if ((!validate || !data) && !!pass) return;
+          // return this.$message.warning('有必填项未填，请检查');
+          // alert(1)
+          // return
           if (this.taskDefinitionKey === 'storeman' && !!pass) {
             // 销售退货入库节点
             this.salesReturnsInStorage(data, pass);

src/views/bpm/stockManagement/storage.vue

@@ -1911,7 +1911,7 @@
                     ).index
                   : this.productList[0].index, // 产品索引
                 batchNo: this.productList[0].batchNo, // 批次号
-                packageNo: item.packageNo || packingCodeList[index]?.onlyCode, // 包装编码
+                packageNo: item.packageNo||item.packingCode || packingCodeList[index]?.onlyCode, // 包装编码
                 packingQuantity: 1, // 包装数量
                 packingUnit: item.packingUnit, // 单位
                 measureQuantity: item.quantity, // 计量数量