huang_an 1 rok temu
rodzic
commit
7e0d89e577

+ 5 - 2
src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -239,10 +239,13 @@
 <script>
   import { getFile } from '@/api/system/file';
   import dictMixins from '@/mixins/dictMixins';
-  import { getSendSaleOrderrecordDetail,getByIdOnlyReplace } from '@/api/bpm/components/saleManage/saleorder';
+  import {
+    getSendSaleOrderrecordDetail,
+    getByIdOnlyReplace
+  } from '@/api/bpm/components/saleManage/saleorder';
   import { reviewStatusEnum } from '@/enum/dict';
   import { copyObj } from '@/utils/util';
-  import add from '@/views/bpm/outgoingManagement/outbound2.vue';
+  import add from '@/views/bpm/outgoingManagement/outbound.vue';
   import fileMain from '@/components/addDoc/index.vue';
 
   export default {

+ 10 - 4
src/views/bpm/outgoingManagement/details.vue

@@ -13,7 +13,9 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="出库物品类型">
-                  <span>{{ handleAssetType(infoData.extInfo.assetType) }}</span>
+                  <span>{{
+                    handleAssetType(infoData.extInfo?.assetType)
+                  }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -23,7 +25,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="关联订单:">
-                  <span>{{ extInfo.documentSource }}</span>
+                  <span>{{ extInfo?.documentSource }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="infoData.bizType == 3">
@@ -78,7 +80,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="领料人部门">
-                  <span>{{ infoData.extInfo.verifyDeptName }}</span>
+                  <span>{{ infoData.extInfo?.verifyDeptName }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -629,12 +631,16 @@
           return;
         }
         let res = {};
+        console.log('isInterior', this.isInterior);
         if (this.isInterior) {
           res = await storageApi.getInboundDetailsById(id);
         } else {
           res = await storageApi.getInfoBySourceBizNo(id);
         }
-        console.log('===', res);
+        console.log(
+          '===============================================================',
+          res
+        );
         this.infoData = res;
         this.extInfo = res.extInfo;
         this.productList = res.outInDetailList.map(

+ 4 - 4
src/views/bpm/outgoingManagement/outbound.vue

@@ -522,7 +522,7 @@
     </el-card>
     <AssetsDialog
       ref="assetsDialogRef"
-      :treeIds="formData.extInfo.assetType"
+      :treeIds="formData.extInfo?.assetType"
       @detailData="detailData"
     />
   </div>
@@ -784,7 +784,7 @@
             obj.extInfo.sourceBizNo = obj.sourceBizNo;
             obj.fromType = obj.type;
             // 处理物品类型assetType
-            obj.extInfo.assetType = obj.extInfo.assetType.join(',');
+            obj.extInfo.assetType = obj.extInfo?.assetType.join(',');
             // 处理仓库id
             let warehouseId = [];
             let warehouseName = [];
@@ -892,7 +892,7 @@
         // 出库类型
         this.formData.bizType = this.bizType;
         // 添加单据来源
-        this.formData.sourceBizNo = this.sourceBizNo||this.form?.code;
+        this.formData.sourceBizNo = this.sourceBizNo || this.form?.code;
         // 将出库状态改成出库状态 2出库 1入库
         this.formData.type = 2;
         // 入库登记人
@@ -986,7 +986,7 @@
             workOrderIds: [this.form.sourceId]
           };
           storageApi
-            .getHierarchyFifo(this.form.sourceId?pData2:pData)
+            .getHierarchyFifo(this.form.sourceId ? pData2 : pData)
             .then((data) => {
               this.detailData(data, this.dimension);
             })

+ 3 - 6
src/views/bpm/stockManagement/details.vue

@@ -515,12 +515,10 @@
           }
         }
       },
-      businessId(val){
-        if(val){
-          this._getInfo(val)
-          
+      businessId(val) {
+        if (val) {
+          this._getInfo(val);
         }
-      
       }
     },
     computed: {
@@ -530,7 +528,6 @@
       }
     },
     mounted() {
-
       this.getFieldModel();
       this.requestDict('类型用途');
       this.getAllCategoryType();

+ 2 - 6
vue.config.js

@@ -1,11 +1,7 @@
 const CompressionWebpackPlugin = require('compression-webpack-plugin');
-const {
-  transformElementScss
-} = require('ele-admin/lib/utils/dynamic-theme');
+const { transformElementScss } = require('ele-admin/lib/utils/dynamic-theme');
 const path = require('path');
-const {
-  name
-} = require('./package.json');
+const { name } = require('./package.json');
 
 function resolve(dir) {
   return path.join(__dirname, dir);