Qukatie 1 tahun lalu
induk
melakukan
81c9e6fb6f

+ 3 - 0
src/enums/column-name.js

@@ -1220,6 +1220,9 @@ const columnName = [{
   code: 274.5,
   name: '轮胎商城-采购管理-盘点列表'
 },{
+  code: 275,
+  name: '轮胎商城-采购管理-采购入库列表'
+},{
   code: 276,
   name: '轮胎商城-采购管理-入库任务-列表'
 },

+ 34 - 29
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -4,8 +4,8 @@
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
         @refresh-change="refreshChange" @expand-change="expandChange"
-        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 270)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 270)" :page.sync="page">
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 275)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 275)" :page.sync="page">
         <template slot-scope="{ row }" slot="expand">
           <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading" :cell-style="cellStyle"
             class="itemTable"></avue-crud>
@@ -27,9 +27,9 @@
           </el-select>
           <span v-else>{{ row.stockClerkName }}</span>
         </template>
-        <template slot-scope="{type,size,row,$index}" slot="customerId">
+        <!-- <template slot-scope="{type,size,row,$index}" slot="customerId">
           <span>{{ row.customerName }}</span>
-        </template>
+        </template> -->
         <template slot-scope="{ row, index }" slot="billno">
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.billno }}
           </span>
@@ -50,7 +50,7 @@ import { getList, remove, getWarehouseKeeper, getGoodsInfo } from "@/api/tirePar
 import detailsPage from "./detailsPage.vue"
 import { dateFormat } from '@/util/date'
 import { getDetails } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
-import {corpsDescListAll} from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { corpsDescListAll } from "@/api/tirePartsMall/salesManagement/saleOrder";
 export default {
   name: "index",
   components: {
@@ -64,7 +64,7 @@ export default {
       stockClerkNameList: [],
       loading: false,
       search: {
-        statusName:'待入库'
+        statusName: '待入库'
       },
       form: {},
       dataList: [],
@@ -217,19 +217,24 @@ export default {
           prop: "customerName",
           search: true,
           overHidden: true,
-          filterable:true,
+          filterable: true,
           type: 'select',
           props: {
             label: 'cname',
             value: 'cname'
           },
-            dicData: [],
+          dicUrl: "/api/blade-sales-part/corpsDesc/listAll?corpType=GYS,KH",
+          // props: {
+          //   label: "account",
+          //   value: "id",
+          //   res: 'data.records'
+          // }
         }, {
           label: "仓库",
           prop: "storageName",
           search: true,
           overHidden: true,
-          filterable:true,
+          filterable: true,
           type: 'select',
           dicUrl: "/api/blade-sales-part/storageDesc/listAll",
           props: {
@@ -350,7 +355,7 @@ export default {
         this.stockClerkNameList = res.data.data;
       })
     })
-    this.option = await this.getColumnData(this.getColumnName(274), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(275), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {
@@ -369,7 +374,7 @@ export default {
     }
     this.corpsDescListAllfun()
   },
-  activated(){
+  activated() {
     // if (this.$route.query.id) {
     //   this.detailData = {
     //     id: this.$route.query.id
@@ -416,16 +421,16 @@ export default {
       });
     },
     searchChange(params, done) {
-        this.page.currentPage = 1
+      this.page.currentPage = 1
       done();
       this.onLoad(this.page, params)
     },
-      // 获取业务对象
-      corpsDescListAllfun(){
-          corpsDescListAll({corpType:'GYS,KH'}).then(res=>{
-              this.findObject(this.option.column, "customerId").dicData = res.data.data
-          })
-      },
+    // 获取业务对象
+    corpsDescListAllfun() {
+      corpsDescListAll({ corpType: 'GYS,KH' }).then(res => {
+        this.findObject(this.option.column, "customerName").dicData = res.data.data
+      })
+    },
     onLoad(page, params = {}) {
       let storageId = this.search.storageName;
       let searchWithoutStorageName = { ...this.search };
@@ -448,17 +453,17 @@ export default {
         this.$refs.crud.toggleRowExpansion(item, false);
       });
       getList(params).then(res => {
-        if (res.data.data.records) {
-          res.data.data.records.forEach(e => {
-            e.itemLoading = true;
-              this.findObject(this.option.column, "customerId").dicData.map(item=>{
-                  if (e.customerId == item.id) {
-                      e.customerName = item.cname
-                  }
-              })
+        // if (res.data.data.records) {
+        //   res.data.data.records.forEach(e => {
+        //     e.itemLoading = true;
+        //       this.findObject(this.option.column, "customerId").dicData.map(item=>{
+        //           if (e.customerId == item.id) {
+        //               e.customerName = item.cname
+        //           }
+        //       })
 
-          });
-        }
+        //   });
+        // }
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
         this.$nextTick(() => {
@@ -466,7 +471,7 @@ export default {
         })
         this.loading = false
       }).finally(() => {
-        this.search=obj2
+        this.search = obj2
         this.loading = false
       })
     },