Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/api/purchase/transferOrder.js

@@ -33,7 +33,6 @@ export function submitOrder(data) {
   })
 }
 // 调拨订单详情
-// 调拨订单详情
 export function getOrderDetail(id) {
   return request({
     url: `/pu/allot/detail/${id}`,
@@ -61,4 +60,12 @@ export function getResevedDetail(id) {
     url: `/pu/ownership/detail/${id}`,
     method: 'get',
   })
+}
+
+// 查询调拨物料明细列表
+export function listStAllotItem(pid) {
+  return request({
+    url: `/pu/allot/material/byPid/${pid}`,
+    method: 'get',
+  })
 }

src/views/purchase/purchase-order/edit/index.vue

@@ -56,6 +56,25 @@ export default {
       deep: true,
       immediate: true
     },
+    "params.billType":{
+      handler(nVal, oVal){
+
+        if((nVal === '21-Cxx-02' || nVal === '21-Cxx-04'  || nVal === '21-Cxx-10')){
+
+          this.rules.warehouseName = [
+            { required: true, message: "WMS入库仓库不能为空", trigger: "change" },
+          ];
+
+          this.rules.goodsAllocationName = [
+            { required: true, message: "货位不能为空", trigger: "change" },
+          ];
+        }else{
+          this.rules.warehouseName = null;
+          this.rules.goodsAllocationName = null;
+        }
+        this.count++;
+      }
+    },
   },
   methods: {
     setVisible(prop) {

src/views/purchase/task/xie-yi-zhi-cai/index.vue

@@ -65,11 +65,13 @@ export default {
           this.data = data.map((item) => ({
             ...item,
             orderPriceVos: item.orderPriceVos.map((cItem) => ({
-              ...item,
+              // ...item,
               ...cItem,
               purchaseQuantity: item.orderPriceVos.length === 1 ? (item.puQty - item.executeQty) : undefined
             })),
           }));
+
+          console.log(this.data,'this.data');
           return true;
         } else {
           return false;

src/views/purchase/transferOrder/add.vue

@@ -702,7 +702,7 @@
                   align="center"
                   prop="pi"
                 >
-                  <template slot-scope="scope">
+                  <!-- <template slot-scope="scope">
                     <el-form-item class="hang">
                       <el-input
                         :disabled="sonDisable"
@@ -710,7 +710,7 @@
                         v-model="scope.row.pi"
                       />
                     </el-form-item>
-                  </template>
+                  </template> -->
                 </el-table-column>
                 <!-- <el-table-column show-overflow-tooltip label="无税金额" align="center" prop="code"/> -->
                 <!-- <el-table-column show-overflow-tooltip label="备注" align="center" prop="code"/> -->

src/views/purchase/transferOrder/index.vue

@@ -154,6 +154,7 @@
         <el-tabs style="margin-top: 10px;">
           <el-tab-pane label="物料信息">
             <el-table
+            v-loading="itemLoading"
             :data="materialInfo" 
             fit
             :cell-style="{ borderColor: '#c0c0c0' }"
@@ -334,7 +335,7 @@
 import Add from './add.vue'
 import CollapseTransition from '@/components/MyCollapse/collapse.vue'
 import Refers from '@/components/Refers/refers.vue'
-import {getOrderList, delOrder, submitOrder } from '@/api/purchase/transferOrder.js'
+import {getOrderList, delOrder, submitOrder,listStAllotItem } from '@/api/purchase/transferOrder.js'
 export default {
   name: 'transferOrder',
   dicts: ['sys_allot_billtype'],
@@ -346,6 +347,7 @@ export default {
   data() {
     return {
       loading: true,
+      itemLoading: true,
       expanded: false,
       // 页面配置
       isList: true,
@@ -467,20 +469,26 @@ export default {
       this.getList(this.queryParams)
     },
     getList(params){
+      this.loading = true;
       getOrderList(this.addDateRange(params, this.dateRange)).then(res => {
         if (res.code === 200) {
           this.tableList = res.rows
           this.total = res.total
-          this.materialInfo = res.rows[0].stAllotMaterialList
         }
+        this.loading = false
       }).then(() => {
         // 合计不显示重绘
         this.$refs.multipleTable.doLayout()
-        this.loading = false
       }).catch(err => {
-        this.loading = false
       })
     },
+    getlistStAllotItem(pid){
+      this.itemLoading = true;
+      listStAllotItem(pid).then((response) => {
+        this.materialInfo = response.rows;
+        this.itemLoading = false;
+      });
+    },
     addOrder() {
       this.isList = false
       this.page = 'add'
@@ -522,8 +530,7 @@ export default {
     },
     // 选中某行
     select(row) {
-      console.log('选中', row)
-      this.materialInfo = row.stAllotMaterialList
+      this.getlistStAllotItem(row.id);
     },
     // 行内删除
     deleteids(row) {