黄梓星 2 лет назад
Родитель
Сommit
4c7bf70a4c

+ 4 - 4
src/views/purchase/DemandSummary/add.vue

@@ -16,13 +16,13 @@
           @selection-change="handleSelectionChange"
         >
         <el-table-column type="selection" width="55" />
-        <el-table-column label="序号" align="center" prop="code"/>
-        <el-table-column label="行号" align="center" prop="code"/>
+        <el-table-column label="序号" align="center" prop="index"/>
+        <el-table-column label="行号" align="center" prop="rowNo"/>
         <el-table-column label="物料编码" align="center" prop="code"/>
         <el-table-column label="品名" align="center" prop="code"/>
         <el-table-column label="规格" align="center" prop="code"/>
         <el-table-column label="单位" align="center" prop="code"/>
-        <el-table-column label="生产厂家/代理人" align="center" prop="code"/>
+        <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
         <el-table-column label="末级供应仓库库存量" align="center" prop="code"/>
         <el-table-column label="月销量" align="center" prop="code"/>
         <el-table-column label="采购周期" align="center" prop="code"/>
@@ -119,7 +119,7 @@ export default {
     getDetails(row) {
       getSummaryDetail(row).then(res => {
         if (res.code === 200) {
-
+          this.tableList = res.data
         }
       })
     },

+ 56 - 25
src/views/purchase/PurchaseDemandList/add.vue

@@ -17,9 +17,9 @@
 
         <el-col :span="1.5">
             <el-form-item label="组织">
-              <el-input v-model="basicForm.org" size="small" style="width: 200px">
-               <el-button slot="append" icon="el-icon-more" @click="chooseOrg"></el-button>
-              </el-input>
+              <el-select size="small" v-model="basicForm.org" :disabled="disable" @focus="chooseOrg" style="width: 200px">
+                <el-option v-for="item in orgOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
          </el-col>
 
@@ -51,14 +51,9 @@
 
          <el-col :span="1.5">
             <el-form-item label="需求客户">
-              <el-select v-model="basicForm.customer" size="small" style="width: 200px" clearable placeholder="请选择">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <el-input v-model="basicForm.customer" size="small" style="width: 200px">
+                <el-button slot="append" icon="el-icon-more" @click="chooseCustomer"></el-button>
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -90,14 +85,12 @@
 
          <el-col :span="1.5">
             <el-form-item label="需求人员">
-              <el-select v-model="basicForm.demandPersonal" size="small" style="width: 200px" clearable placeholder="请选择">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+                <!-- <el-input v-model="basicForm.demandPersonal" size="small" style="width: 200px">
+                  <el-button slot="append" icon="el-icon-more" @click="choosePerson"></el-button>
+                </el-input> -->
+                <el-select size="small" v-model="basicForm.demandPersonal" :disabled="disable" @focus="choosePerson" style="width: 200px">
+                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
             </el-form-item>
           </el-col>
 
@@ -499,19 +492,23 @@
       </el-col>
 
       <Reserved v-if="dialog.config" :isVisible="dialog.config" :info="row" @updateReserved="updateReserved"/>
+
+      <Refers ref="refer" @doSubmit="selectionsToInput" :single="true"/>
     </div>
   </div>
 </template>
 
 <script>
 import Reserved from './reserved.vue'
+import Refers from './refers.vue'
 import {addDemand,getDemandDetail, getDemandSonDetail, editDemand} from '@/api/purchase/purchaseDemand.js'
 import {getRefer} from '@/api/purchase/basic.js'
 export default {
   name: 'addDemandList',
   props: ['pageStu','row', 'disable'],
   components: {
-    Reserved
+    Reserved,
+    Refers
   },
   model: {
     prop: 'isList',
@@ -549,7 +546,15 @@ export default {
         value: '0', label: '否'
       }],
       basicRules: {},
-      tableList: []
+      tableList: [],
+      referCondition: {
+        type: 'ORG_PARAM',
+        search: '',
+        isPage: true,
+        title: '选择组织'
+      },
+      orgOptions: [],
+      personOptions: []
     }
   },
   created() {
@@ -721,11 +726,37 @@ export default {
       this.dialog.config = val
     },
     chooseOrg() {
-      getRefer({type:'ORG_PARAM', search:'BB国际'}).then(res => {
-        console.log("🚀 ~ file: add.vue:725 ~ getRefer ~ res:", res)
-        
-      })
+      this.referCondition.type = 'ORG_PARAM'
+      this.referCondition.search = ''
+      this.referCondition.isPage = true
+      this.referCondition.title = '选择组织'
+      this.$refs.refer.init(this.referCondition)
+    },
+    chooseCustomer () {
+      this.referCondition.type = ''
+      this.referCondition.search = ''
+      this.referCondition.isPage = true
+      this.referCondition.title = '选择客户'
+      this.$refs.refer.init(this.referCondition)
+    },
+    choosePerson() {
+      this.referCondition.type = 'CONTACTS_PARAM'
+      this.referCondition.search = ''
+      this.referCondition.isPage = true
+      this.referCondition.title = '需求人员'
+      this.$refs.refer.init(this.referCondition)
     },
+    selectionsToInput(selection) {
+      console.log("🚀 ~ file: add.vue:732 ~ selectionsToInput ~ selection:", selection)
+      if(this.referCondition.type == 'ORG_PARAM') {
+        this.orgOptions = selection
+        this.basicForm.org = selection[0].id
+      }
+      if(this.referCondition.type == 'CONTACTS_PARAM') {
+        this.personOptions = selection
+        this.basicForm.demandPersonal = selection[0].id
+      }
+    }
   }
 }
 </script>

+ 170 - 0
src/views/purchase/PurchaseDemandList/refers.vue

@@ -0,0 +1,170 @@
+<template>
+  <div>
+    <el-dialog :title="reciveForm.title" width="1000px" :close-on-click-modal="false" :append-to-body="true" v-dialogDrag
+      class="userDialog" :visible.sync="visible">
+      <el-container style="height: 500px">
+        <el-container>
+          <el-header style="text-align: left; font-size: 12px; height: 30px">
+            <el-form size="small" :inline="true" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()"
+              @submit.native.prevent>
+              <el-form-item prop="param" label="名称/编号">
+                <el-input size="small" v-model="searchForm.param" placeholder="输入名称/编号查询" clearable></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
+                <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </el-header>
+          <el-main>
+            <el-table :data="dataList" v-loading="loading" size="small" border ref="contractTable"
+              @select="handleSelectionChange" @row-click="rowSelect" height="calc(100% - 40px)" style="width: 100%">
+              <el-table-column type="selection" header-align="center" align="center" width="50">
+              </el-table-column>
+              <el-table-column prop="id" header-align="center" align="center" sortable="custom" min-width="90" label="id">
+              </el-table-column>
+              <el-table-column prop="name" header-align="center" align="center" sortable="custom" min-width="90"
+                label="名称">
+              </el-table-column>
+            </el-table>
+            <el-pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+              :current-page="searchForm.pageNo" :page-sizes="[5, 10, 15, 20]" :page-size="searchForm.pageSize"
+              :total="total" layout="total, sizes, prev, pager, next, jumper">
+            </el-pagination>
+          </el-main>
+        </el-container>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="visible = false" icon="el-icon-circle-close">关闭</el-button>
+        <el-button size="small" type="primary" icon="el-icon-circle-check" @click="doSubmit()">确定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getRefer } from '@/api/purchase/basic'
+export default {
+  data() {
+    return {
+      searchForm: {
+        param: '',
+        pageNo: 1,
+        pageSize: 10,
+      },
+      reciveForm: {},
+      dataListAllSelections: [], // 所有选中的数据包含跨页数据
+      idKey: "id", // 标识列表数据中每一行的唯一键的名称(需要按自己的数据改一下)
+      dataList: [],
+      total: 0,
+      orders: [],
+      loading: false,
+      visible: false,
+    };
+  },
+  props: {
+    selectData: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+    // 是否启用单选
+    single: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    init(val) {
+      this.visible = true;
+      console.log("🚀 ~ file: refers.vue:79 ~ init ~ init(val):", val)
+      this.reciveForm = val
+      this.$nextTick(() => {
+        this.dataListAllSelections = JSON.parse(JSON.stringify(this.selectData));
+        this.resetSearch();
+      });
+    },
+    // 获取数据列表
+    refreshList() {
+      this.loading = true;
+      let params = {...this.searchForm, ...this.reciveForm}
+      getRefer(params).then(res => {
+        console.log('res', res)
+        this.dataList = res.rows;
+        this.total = res.total
+        this.loading = false;
+        this.$nextTick(() => {
+          this.setSelectRow();
+        });
+      });
+    },
+    // 每页数
+    sizeChangeHandle(val) {
+      this.searchForm.pageSize = val;
+      this.refreshList();
+    },
+    // 当前页
+    currentChangeHandle(val) {
+      this.searchForm.pageNo = val;
+      this.refreshList();
+    },
+    // 排序
+    resetSearch() {
+      this.$refs['searchForm'].resetFields();
+      this.searchForm.pageNo = 1;
+      this.refreshList();
+    },
+    // 表格选中数据
+    rowSelect(row, column, event) {
+      this.$refs.contractTable.clearSelection();
+      this.$refs.contractTable.toggleRowSelection(row);
+      this.dataListAllSelections = this.single ? [row] : selection
+    },
+    // 选中数据
+    handleSelectionChange(selection, row) {
+      if (this.single && selection.length > 1) {
+        this.$refs.contractTable.clearSelection();
+        this.$refs.contractTable.toggleRowSelection(row);
+      }
+      this.dataListAllSelections = this.single ? [row] : selection
+    },
+    // 设置选中的方法
+    setSelectRow() {
+      this.$refs.contractTable.clearSelection();
+      if (!this.dataListAllSelections || this.dataListAllSelections.length <= 0) {
+        return;
+      }
+      for (let i = 0; i < this.dataList.length; i++) {
+        if (this.dataListAllSelections.some(item => item[this.idKey] == this.dataList[i][this.idKey])) {
+          // 设置选中,记住table组件需要使用ref="table"
+          this.$refs.contractTable.toggleRowSelection(this.dataList[i], true);
+        }
+      }
+    },
+    doSubmit() {
+      this.visible = false;
+      console.log('选择的数据?', this.dataListAllSelections)
+      this.$emit("doSubmit", this.dataListAllSelections);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.userDialog {
+  .el-dialog__body {
+    padding: 10px 0px 0px 10px;
+    color: #606266;
+    font-size: 14px;
+    word-break: break-all;
+  }
+
+  .el-main {
+    padding: 20px 20px 5px 20px;
+
+    .el-pagination {
+      margin-top: 5px;
+    }
+  }
+}
+</style>