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

src/views/bpm/done/detailDialog.vue

@@ -32,7 +32,7 @@
         :edit="false"
         ref="generateForm"
       >
-              <template v-slot:blank_adopzrdd="scope">
+        <template v-slot:blank_adopzrdd="scope">
           <div v-for="(item, index) in scope.model.blank_adopzrdd" :key="index">
             <div class="blank_adopzrdd">
               <span>{{ index + 1 }}报销事项：</span>
@@ -111,6 +111,7 @@
 
         this.activeComp = 'main';
         this.visible = true;
+        console.log('this.form.pcViewRouter', this.form.pcViewRouter);
         Vue.component('async-biz-form-component', (resolve) => {
           require([`@/views${this.form.pcViewRouter}`], resolve);
         });
@@ -142,7 +143,7 @@
       font-weight: bold;
     }
   }
-    .blank_adopzrdd {
+  .blank_adopzrdd {
     display: flex;
     align-items: center;
     > span {

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

@@ -47,7 +47,7 @@
                 </el-link>
               </template>
 
-              
+
 
 
 
@@ -84,7 +84,7 @@
     <timeDialog ref="timeDialogRef"></timeDialog>
   </div>
 </template>
-  
+
 <script>
 import { getById } from '@/api/bpm/components/materialPlan/index';
 import { getFile } from '@/api/system/file';
@@ -244,11 +244,11 @@ export default {
           align: 'center',
         },
 
-        {
-          label: '采购数量',
-          prop: 'purchaseQuantity',
-          align: 'center'
-        },
+        // {
+        //   label: '采购数量',
+        //   prop: 'purchaseQuantity',
+        //   align: 'center'
+        // },
 
         {
           label: '到货方式',
@@ -326,7 +326,7 @@ export default {
   }
 };
 </script>
-  
+
 <style lang="scss" scoped>
 :deep(.el-table__expanded-cell) {
 

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

@@ -68,7 +68,7 @@
       <add
         ref="add"
         :form="form"
-        :bizType="1"
+        :bizType="taskDefinitionKey == 'wmsBizType4' ? 4 : 1"
         v-if="form.code"
         :sourceBizNo="form.code"
         :detailList="form.detailList"
@@ -146,6 +146,7 @@
         console.log('data-----------', data);
         this.loading = false;
         if (data) {
+          this.form = data;
           let categoryLevelTopIds = data.detailList.map(
             (item) => item.rootCategoryLevelId
           );
@@ -153,7 +154,23 @@
             new Set(categoryLevelTopIds)
           );
           data.categoryLevelTopId = filterCategoryLevelTopIds.join(',');
-          this.form = data;
+
+          if (this.taskDefinitionKey == 'wmsBizType4') {
+            this.form.totalCount = data.detailList.reduce(
+              (sum, item) => sum + (item.quantity || 0),
+              0
+            );
+
+            this.$set(
+              this.form,
+              'totalCount',
+              data.detailList.reduce(
+                (sum, item) => sum + (item.quantity || 0),
+                0
+              )
+            );
+          }
+
           this.totalPackage =
             this.form.detailList.length + this.form?.detailList[0]?.packingUnit;
           this.totalCount =

src/views/bpm/stockManagement/storage.vue

@@ -1118,7 +1118,7 @@
               <span>{{ qualityStatus[row.status] }}</span>
             </template>
           </el-table-column>
-         
+
         </el-table> -->
       </div>
     </el-card>
@@ -1690,6 +1690,10 @@
               warehouseIds.push(this.form.warehouseId);
               warehouseNames.push(this.form.warehouseName);
             }
+            if (this.bizType == 4) {
+              warehouseIds.push(this.form.warehouseId);
+              warehouseNames.push(this.form.warehouseName);
+            }
             if (this.isMoreProduct) {
               this.formData.extInfo.assetType = [];
               res.map((item) => {

vue.config.js

@@ -38,8 +38,13 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
+
+        // target: 'http://192.168.1.251:18186',
+        // target: 'http://192.168.1.144:18086',
+        target: 'http://192.168.1.125:18086',
+
         // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.144:18086',
+
         changeOrigin: true, // 只有这个值为true的情况下 s才表示开启跨域
         pathRewrite: {
           '^/api': ''