Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!414

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/material/basicFile/columns.js

@@ -12,6 +12,14 @@ export const SearchColumns = [
     },
   },
   {
+    item: { key: "materialCodes", title: "物料编码" },
+    attr: {
+      clearable: true,
+      is: "el-input",
+      placeholder: '多物料编码使用 , 隔开',
+    },
+  },
+  {
     item:{
       key: "name",
       title: "物料名称",  

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) {

src/views/purchase/workSpace/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <div id="workSpace">
+    <el-card style="position: relative;">
+      <el-form label-width="100px">
+        <el-row :gutter="10">
+          <el-col :span="1.5">
+              <el-form-item label="单据标题">
+                <el-input
+                  v-model.trim="queryParams.title"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+
+          <el-col :span="1.5">
+              <el-form-item label="单据类型">
+                <el-select multiple v-model="queryParams.rowStatus" size="mini" style="width: 200px" clearable>
+                  <el-option v-for="dict in dict.type.sys_row_status" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+        </el-row>
+      </el-form>
+
+      <div style="position: absolute;top: 18px;right: 10px;">
+        <el-button type="primary" size="mini" @click="searchList">搜索</el-button>
+        <el-button size="mini" plain @click="resetList">重置</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'workSpace',
+  dicts: ['sys_row_status'],
+  data() {
+    return {
+      queryParams: {
+        rowStatus:['1'],
+        title: ''
+      }
+    }
+  },
+  methods: {
+    searchList() {},
+    resetList() {},
+  }
+}
+</script>
+
+<style lang="scss">
+#workSpace {
+  padding: 12px;
+  box-sizing: border-box;
+  overflow-y: scroll;
+}
+  
+</style>