huang_an пре 2 година
родитељ
комит
e6ea49b0eb
2 измењених фајлова са 19 додато и 15 уклоњено
  1. 18 14
      src/views/warehouseManagement/outgoingManagement/details.vue
  2. 1 1
      vue.config.js

+ 18 - 14
src/views/warehouseManagement/outgoingManagement/details.vue

@@ -59,11 +59,7 @@
                   <span>{{ infoData.sourceBizNo }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="领料人">
-                  <span>{{ infoData.fromUser }}</span>
-                </el-form-item>
-              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="领料人联系方式">
                   <span>{{ infoData.fromUserPhone }}</span>
@@ -95,13 +91,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="审核人部门">
+                <el-form-item label="领料人部门">
                   <span>{{ infoData.verifyDeptName }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="审核人">
-                  <span>{{ infoData.verifyName }}</span>
+                <el-form-item label="领料人">
+                  <span>{{ infoData.fromUser }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="16">
@@ -185,10 +181,7 @@
                   label="金额"
                   prop="totalMoney"
                 ></el-table-column>
-                <el-table-column
-                  label="领料部门"
-                  prop="position"
-                ></el-table-column>
+                <el-table-column label="领料部门" prop="llbm"></el-table-column>
               </el-table>
             </div>
           </div>
@@ -290,7 +283,7 @@
             </el-table-column>
             <el-table-column label="领料部门" prop="">
               <template slot-scope="{ row }">
-                {{ row.position }}
+                {{ row.llbm }}
               </template>
             </el-table-column>
             <!-- <el-table-column label="转消耗" prop="">
@@ -478,7 +471,18 @@
           //     return item;
           //   }
           // );
-          this.warehousingMaterialList = res.outInDetailVOList;
+          for (const item of res.outInDetailVOList) {
+            for (const it of item.outInDetailRecordVOList) {
+              it.llbm = res.extInfo.verifyDeptName;
+            }
+          }
+          this.warehousingMaterialList = res.outInDetailVOList.map((item) => {
+            return {
+              ...item,
+              llbm: res.extInfo.verifyDeptName
+            };
+          });
+
           // this.materialCodeReqList =
           //   res.warehouseLedgerInfos.warehouseLedgerDetails;
           let arr = [];

+ 1 - 1
vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
-        target: 'http://192.168.1.114:18086',
+        target: 'http://192.168.1.108:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''