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

src/BIZComponents/product-list.vue

@@ -140,7 +140,7 @@
             :initLoad="!isFirstRefreshTable"
             @columns-change="handleColumnChange"
             :rowClickChecked="true"
-            :cache-key="'product-list-cache-key'"
+            :cache-key="cacheKey"
           >
             <!-- 表头工具栏 -->
             <template v-slot:action="{ row }">
@@ -260,6 +260,7 @@
         isColorId: [],
         dataSources: '1', // 0：仓库；1：主数据
         dimension: '1',
+        cacheKey: 'product-list-cache-key',
         searchForm: {
           categoryCode: '',
           categoryName: '',
@@ -427,7 +428,6 @@
                   row.warrantyPeriodUnit
                 );
               }
-              console.log(row.warrantyPeriodUnit, unit)
               return row.warrantyPeriod ? row.warrantyPeriod + unit : '';
             }
           },

src/BIZComponents/selectStockLedger/selectStockLedgerDialog.vue

@@ -186,6 +186,18 @@
             align: 'center',
             showOverflowTooltip: true
           },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             prop: 'measureQuantity',
             label: '库存',

src/views/saleManage/quotation/components/addDialog.vue

@@ -20,7 +20,7 @@
       class="el-form-box"
     >
       <headerTitle title="基本信息"></headerTitle>
-      <el-row gutter="12">
+      <el-row :gutter="12">
         <el-col :span="12">
           <el-form-item label="类型" prop="type">
             <el-select
@@ -770,12 +770,13 @@ export default {
             });
         } else {
           if (this.editType == 'copy') {
+            console.log('copy~~~~~~')
+            // 删除quoteProductList中每个对象的id属性
+            commitData.quoteProductList = commitData.quoteProductList.map(({ id, ...rest }) => rest);
+            // 删除commitData本身的id属性
             delete commitData.id;
-            this.commitData.quoteProductList = commitData.quoteProductList.map((item) => {
-              delete item.id;
-              return item;
-            })
           }
+          console.log('commitData~~~~~~~~', commitData)
           addInformation(commitData)
             .then((res) => {
               this.loading = false;

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -41,6 +41,12 @@
               @change="needProduceChange"
               >无客户生产性订单</el-radio
             >
+            <el-radio
+              v-model="form.needProduce"
+              :label="5"
+              @change="needProduceChange"
+              >委外订单</el-radio
+            >
             <el-radio
               v-model="form.needProduce"
               :label="4"
@@ -1663,6 +1669,20 @@
           );
         }
 
+        if (this.form.needProduce == 4) {
+          arr.push(
+            new Promise((resolve, reject) => {
+              this.$refs.typeListRef.validateForm((valid) => {
+                if (!valid) {
+                  reject(false);
+                } else {
+                  resolve(true);
+                }
+              });
+            })
+          );
+        }
+
         return Promise.all(arr);
       },
       async save(type) {

src/views/saleManage/saleOrder/components/darwerComponents/saleOrderInfo.vue

@@ -83,6 +83,12 @@
             <el-radio v-model="form.needProduce" disabled :label="2"
               >无客户生产性订单</el-radio
             >
+            <el-radio
+              v-model="form.needProduce"
+              disabled
+              :label="5"
+              >委外订单</el-radio
+            >
             <el-radio
               v-model="form.needProduce"
               disabled

src/views/saleManage/saleOrder/index.vue

@@ -649,6 +649,8 @@ export default {
                 ? '无客户生产性订单'
                 : cellValue == 4
                 ? '不定向订单'
+                : cellValue == 5
+                ? '委外订单'
                 : '库存式订单';
 
             return businessType;

src/views/saleManage/saleOrder/invoice/components/print-template-ht.vue

@@ -113,7 +113,7 @@
         "
       >
         <div style="flex: 1">
-          <div>业务员：{{ formData.saleOrderList[0]?.partbLinkName }}</div>
+          <div>业务员：{{ formData.saleOrderList[0]?.salesmanName }}</div>
         </div>
         <div style="flex: 1">
           <div>制单人：{{ formData.makerName }}</div>

src/views/salesServiceManagement/components/AssetsDialog.vue

@@ -573,7 +573,7 @@
         this.currentRow = val;
       },
       async warehouseData() {
-        const res = await getProductList(this.searchForm);
+        const res = await getProductList({...this.searchForm, isEnabled: 1});
         this.tableData = res.list.map((el) => {
           el.categoryModel = el.modelType;
           el.categoryName = el.name;