Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/views/purchasingManage/purchaseNeedManage/components/searchQuotation.vue

@@ -3,92 +3,83 @@
   <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-import { reviewStatusSelect } from '@/enum/dict';
-import {
+  import { reviewStatusSelect,requirementSourceType } from '@/enum/dict';
 
-  assessmentIndicatorsOptions
-} from '@/views/targetManage/util.js';
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    // 表格列配置
-    seekList() {
-      return [
-        {
-          label: '关键字：',
-          value: 'searchName',
-          type: 'input',
-          placeholder: '需求单编码/需求单名称/产品名称'
-        },
-        {
-          label: '需求单编码：',
-          value: 'requirementCode',
-          type: 'input',
-          placeholder: '请输入'
-        },
-        // {
-        //   label: '需求单名称：',
-        //   value: 'requirementName',
-        //   type: 'input',
-        //   placeholder: '请输入',
-        // },
-        // {
-        //   label: '产品名称：',
-        //   value: 'productNames',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入',
-        // },
-        // {
-        //   label: '需求类型：',
-        //   value: 'sourceTypeName',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        {
-          label: '需求部门：',
-          value: 'requireDeptName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '需求人：',
-          value: 'requireUserName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '状态：',
-          value: 'status',
-          width: 380,
-          type: 'select',
-          placeholder: '请选择状态',
-          planList: reviewStatusSelect
-        },
-        {
-          label: '创建时间：',
-          value: 'createTime',
-          type: 'date',
-          dateType: 'datetimerange',
-          placeholder: '',
-          width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
-        },
-      ];
+  export default {
+    data() {
+      return {};
+    },
+    computed: {
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字：',
+            value: 'searchName',
+            type: 'input',
+            placeholder: '需求单编码/需求单名称/产品名称'
+          },
+          {
+            label: '需求单编码：',
+            value: 'requirementCode',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          // {
+          //   label: '需求单名称：',
+          //   value: 'requirementName',
+          //   type: 'input',
+          //   placeholder: '请输入',
+          // },
+          // {
+          //   label: '产品名称：',
+          //   value: 'productNames',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: '请输入',
+          // },
+    
+          {
+            label: '需求部门：',
+            value: 'requireDeptName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '需求人：',
+            value: 'requireUserName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '状态：',
+            value: 'status',
+            width: 380,
+            type: 'select',
+            placeholder: '请选择状态',
+            planList: reviewStatusSelect
+          },
+          {
+            label: '创建时间：',
+            value: 'createTime',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['createTimeStart', 'createTimeEnd']
+          }
+        ];
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
+      }
     }
-  },
-  methods: {
-    /* 搜索 */
-    search(e) {
-      this.$emit('search', {
-        ...e
-      });
-    }
-  }
-};
+  };
 </script>

src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -150,7 +150,7 @@
             @change="warehouseChange(scope.$index, scope.row)"
           >
             <el-option
-              v-for="item in warehouseList"
+              v-for="item in warehouseList.filter((item) => item.inventoryType == (scope.row.categoryLevelRootId||scope.row.categoryRootLevelId))"
               :key="item.id"
               :label="item.name"
               :value="item.id"

src/views/purchasingManage/purchasePlanManage/components/searchQuotation.vue

@@ -3,115 +3,113 @@
   <seekPage :seekList="seekList" :formLength="3" @search="search"></seekPage>
 </template>
 <script>
-import { reviewStatusSelect } from '@/enum/dict';
-import {
+  import { reviewStatusSelect, requirementSourceType } from '@/enum/dict';
 
-  assessmentIndicatorsOptions
-} from '@/views/targetManage/util.js';
-export default {
-  data() {
-    return {};
-  },
-  computed: {
-    // 表格列配置
-    seekList() {
-      return [
-        {
-          label: '关键字：',
-          value: 'searchName',
-          type: 'input',
-          placeholder: '采购计划单编码/采购计划单名称'
-        },
-        // {
-        //   label: '采购计划单编码：',
-        //   value: 'planCode',
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        // {
-        //   label: '计划进度：',
-        //   value: 'progress',
-        //   type: 'input',
-        //   placeholder: '请输入',
-        // },
-        // {
-        //   label: '采购计划单名称：',
-        //   value: 'planName',
-        //   labelWidth:120,
-        //   width: 340,
-        //   type: 'input',
-        //   placeholder: '请输入',
-        // },
-        {
-          label: '采购需求单名称：',
-          value: 'requirementName',
-          labelWidth:150,
-          width: 340,
-          type: 'input',
-          placeholder: '请输入',
-        },
-        {
-          label: '产品名称',
-          value: 'productName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        // {
-        //   label: '需求类型：',
-        //   value: 'sourceTypeName',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        {
-          label: '需求部门：',
-          value: 'requireDeptName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        {
-          label: '需求人：',
-          value: 'requireUserName',
-          width: 380,
-          type: 'input',
-          placeholder: '请输入'
-        },
-        // {
-        //   label: '负责人：',
-        //   value: 'responsibleName',
-        //   width: 380,
-        //   type: 'input',
-        //   placeholder: '请输入'
-        // },
-        {
-          label: '状态：',
-          value: 'status',
-          width: 380,
-          type: 'select',
-          placeholder: '请选择状态',
-          planList: reviewStatusSelect
-        },
-        {
-          label: '创建时间：',
-          value: 'createTime',
-          type: 'date',
-          dateType: 'datetimerange',
-          placeholder: '',
-          width: 380,
-          valueAr: ['createTimeStart', 'createTimeEnd']
-        },
-      ];
+  export default {
+    data() {
+      return {};
+    },
+    computed: {
+      // 表格列配置
+      seekList() {
+        return [
+          {
+            label: '关键字：',
+            value: 'searchName',
+            type: 'input',
+            placeholder: '采购计划单编码/采购计划单名称'
+          },
+          // {
+          //   label: '采购计划单编码：',
+          //   value: 'planCode',
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          // {
+          //   label: '计划进度：',
+          //   value: 'progress',
+          //   type: 'input',
+          //   placeholder: '请输入',
+          // },
+          // {
+          //   label: '采购计划单名称：',
+          //   value: 'planName',
+          //   labelWidth:120,
+          //   width: 340,
+          //   type: 'input',
+          //   placeholder: '请输入',
+          // },
+          {
+            label: '采购需求单名称：',
+            value: 'requirementName',
+            labelWidth: 150,
+            width: 340,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '产品名称',
+            value: 'productName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '需求类型：',
+            value: 'sourceType',
+            width: 380,
+            type: 'select',
+            placeholder: '请选择需求类型',
+            planList: requirementSourceType
+          },
+          {
+            label: '需求部门：',
+            value: 'requireDeptName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '需求人：',
+            value: 'requireUserName',
+            width: 380,
+            type: 'input',
+            placeholder: '请输入'
+          },
+          // {
+          //   label: '负责人：',
+          //   value: 'responsibleName',
+          //   width: 380,
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          {
+            label: '状态：',
+            value: 'status',
+            width: 380,
+            type: 'select',
+            placeholder: '请选择状态',
+            planList: reviewStatusSelect
+          },
+          {
+            label: '创建时间：',
+            value: 'createTime',
+            type: 'date',
+            dateType: 'datetimerange',
+            placeholder: '',
+            width: 380,
+            valueAr: ['createTimeStart', 'createTimeEnd']
+          }
+        ];
+      }
+    },
+    methods: {
+      /* 搜索 */
+      search(e) {
+        this.$emit('search', {
+          ...e
+        });
+      }
     }
-  },
-  methods: {
-    /* 搜索 */
-    search(e) {
-      this.$emit('search', {
-        ...e
-      });
-    }
-  }
-};
+  };
 </script>

src/views/saleManage/saleOrder/entrustedReceive/components/addOrEditDialog.vue

@@ -281,14 +281,14 @@
                   return item;
                 });
                 mbomCategoryList.push(...arr);
-                // v.orderTotalCount = v.orderTotalCount || v.totalCount;
-                // v.batchNo = await getCode('lot_number_code');
               });
-             await mbomCategoryList.forEach(async (v) => {
-                v.batchNo = await getCode('lot_number_code');
+              const batchNoS = await this.getBatchNo(mbomCategoryList);
+              console.log(batchNoS);
+              mbomCategoryList.forEach((v, i) => {
+                v['batchNo'] = batchNoS[i];
               });
             }
-            console.log(mbomCategoryList,'mbomCategoryList')
+            console.log(mbomCategoryList, 'mbomCategoryList');
             this.form = Object.assign({}, this.form, {
               contactId: partaId,
               contactName: partaName,
@@ -299,15 +299,24 @@
               productList: mbomCategoryList,
               pricingWay
             });
-            // this.form = await this.getTotalCountHistory(this.form);
             this.$refs.inventoryTableref &&
-              this.$refs.inventoryTableref.putTableValue(
-                this.form.productList
-              );
+              this.$refs.inventoryTableref.putTableValue(this.form.productList);
           });
         }
       },
-
+      getBatchNo(arr) {
+        let promiseAll = [];
+        arr.forEach((item) => {
+          promiseAll.push(
+            new Promise((resolve, reject) => {
+              getCode('lot_number_code').then((res) => {
+                resolve(res);
+              });
+            })
+          );
+        });
+        return Promise.all(promiseAll);
+      },
       //发货单详情
       async getSendSaleOrderDetail(id) {
         this.businessId = id;

src/views/saleManage/saleOrder/invoice/components/product-listNew.vue

@@ -1,12 +1,13 @@
 <template>
-  <el-dialog
+  <ele-modal
     title="选择产品"
     :visible.sync="visible"
     :close-on-click-modal="false"
-    top="5vh"
     :close-on-press-escape="false"
     append-to-body
     width="70%"
+    :maxable="true"
+    :resizable="true"
   >
     <el-card shadow="never">
       <ele-pro-table
@@ -14,7 +15,8 @@
         :columns="columns"
         :datasource="datasource"
         row-key="id"
-        height="calc(100vh - 350px)"
+        height="450"
+        full-height="calc(100vh - 76px)"
         class="dict-table"
         :selection.sync="selection"
       >
@@ -25,7 +27,7 @@
       <el-button type="primary" size="small" @click="selected">选择</el-button>
       <el-button size="small" @click="visible = false">关闭</el-button>
     </div>
-  </el-dialog>
+  </ele-modal>
 </template>
 
 <script>
@@ -42,7 +44,6 @@
             fixed: 'left',
             align: 'center',
             reserveSelection: true
-
           },
 
           {
@@ -145,7 +146,6 @@
             label: '未发货数量',
             align: 'center',
             fixed: 'right'
-
           },
 
           {