'add'

src/page/purchase/components/order/orderAdd.vue

@@ -32,7 +32,7 @@
                 v-for="item in glqyList"
                 :value="item.value + ',' + item.label"
                 :key="item.value"
-                :disabled="form.spzt != '1' || form.spzt != '4'"
+                :disabled="form.spzt == '2' || form.spzt == '3'"
               >{{ item.label }}</Option>
             </Select>
             <span v-else>{{ form.glqy.split(',')[1] }}</span>
@@ -44,7 +44,7 @@
                 v-for="item in glxmList"
                 :value="item.value + ',' + item.label"
                 :key="item.value"
-                :disabled="form.spzt != '1' || form.spzt != '4'"
+                :disabled="form.spzt == '2' || form.spzt == '3'"
               >{{ item.label }}</Option>
             </Select>
             <span v-else>{{ form.glxm.split(',')[1] }}</span>
@@ -56,7 +56,7 @@
                 v-for="item in djlxList"
                 :value="item.value"
                 :key="item.value"
-                :disabled="form.spzt != '1' || form.spzt != '4'"
+                :disabled="form.spzt == '2' || form.spzt == '3'"
               >{{ item.label }}</Option>
             </Select>
           </Col>
@@ -68,7 +68,7 @@
                 v-for="item in cgrList"
                 :value="item.value + ',' + item.label"
                 :key="item.value"
-                :disabled="form.spzt != '1' || form.spzt != '4'"
+                :disabled="form.spzt == '2' || form.spzt == '3'"
               >{{ item.label }}</Option>
             </Select>
           </Col>
@@ -76,7 +76,7 @@
           <Col span="4" class-name="tables">
             <Input
               v-model="form.cgrlxfs"
-              :disabled="form.spzt != '1' || form.spzt != '4'"
+              :disabled="form.spzt == '2' || form.spzt == '3'"
               placeholder="请输入"
               style="width: 95%"
             />
@@ -90,7 +90,7 @@
               @on-change="form.xdrq=$event"
               type="datetime"
               placeholder="请选择"
-              :disabled="form.spzt != '1' || form.spzt != '4'"
+              :disabled="form.spzt == '2' || form.spzt == '3'"
             ></DatePicker>
           </Col>
           <Col span="4" class-name="tables">交货时间</Col>
@@ -112,7 +112,7 @@
           <Col span="4" class-name="tables">
             <Input
               v-model="form.shr"
-              :disabled="form.spzt != '1' || form.spzt != '4'"
+              :disabled="form.spzt == '2' || form.spzt == '3'"
               placeholder="请输入"
               style="width: 95%"
             />
@@ -121,7 +121,7 @@
           <Col span="4" class-name="tables">
             <Input
               v-model="form.shrlxfs"
-              :disabled="form.spzt != '1' || form.spzt != '4'"
+              :disabled="form.spzt == '2' || form.spzt == '3'"
               placeholder="请输入"
               style="width: 95%"
             />
@@ -131,7 +131,7 @@
             <Select v-model="form.gys" style="width: 95%" v-if="orderType == 'add'">
               <Option
                 v-for="item in gysList"
-                :disabled="form.spzt != '1' || form.spzt != '4'"
+                :disabled="form.spzt == '2' || form.spzt == '3'"
                 :value="item.value"
                 :key="item.value"
               >{{ item.label }}</Option>
@@ -174,7 +174,7 @@
               style="width: 80%"
               multiple
               type="drag"
-              :disabled="form.spzt != '1' || form.spzt != '4'"
+              :disabled="form.spzt == '2' || form.spzt == '3'"
               action="/landcrm/rest/uploadFileInfo/uploadMutiFile"
               :before-upload="beforeUpload"
               :on-success="uploadFilesSuccess"
@@ -201,7 +201,7 @@
           <Col span="20" class-name="tables">
             <Input
               v-model="form.sm"
-              :disabled="form.spzt != '1' || form.spzt != '4'"
+              :disabled="form.spzt == '2' || form.spzt == '3'"
               placeholder="请输入"
               style="width: 99%"
             />
@@ -212,7 +212,7 @@
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p slot="title">采购明细</p>
         <div slot="extra">
-          <Button type="primary" @click="contentShow = false" :disabled="orderType == 'add'">新增明细</Button>
+          <Button type="primary" @click="mxAddShow" :disabled="orderType == 'add'">新增明细</Button>
         </div>
         <Table
           :columns="tableColumn"
@@ -292,7 +292,7 @@
       </Modal>-->
     </div>
     <!-- 计划明细新增 -->
-    <orderMxAdd @return="contentShow = true" v-show="!contentShow" />
+    <orderMxAdd ref="mxAdd" @return="contentShow = true" v-show="!contentShow" />
   </div>
 </template>
 
@@ -327,7 +327,7 @@ export default {
         gffzr: "", //供方负责人
         gyslxdh: "", //供应商联系电话
         sm: "", //说明
-        spzt: "", //审批状态
+        spzt: 1, //审批状态
         sptgsj: "", //审批通过时间
         ddzt: "", //订单状态
         filesList: []
@@ -570,6 +570,11 @@ export default {
         }
       });
     },
+    //新增明细
+    mxAddShow() {
+      this.contentShow = false;
+      this.$refs.mxAdd.getTableData();
+    },
     //列表方法
     getTableData() {
       this.spinShow = false;
@@ -593,7 +598,7 @@ export default {
       this.form.gyslxdh = "";
       this.form.sm = "";
       this.form.filesList = [];
-      this.form.spzt = "";
+      this.form.spzt = 1;
       this.tableData = [];
       this.orderType = "add";
       this.spinShow = false;

src/page/purchase/components/order/orderMxAdd.vue

@@ -7,7 +7,9 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Input v-model="searchForm.ck" placeholder="仓库名" />
+          <Select v-model="searchForm.ck" placeholder="仓库名">
+            <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+          </Select>
         </Col>
         <Col span="4">
           <Select v-model="searchForm.yjfl" placeholder="一级分类">
@@ -23,7 +25,7 @@
           <Input v-model="searchForm.wlmc" placeholder="物料编码或名称" />
         </Col>
         <Col span="8">
-          <Button type="primary" style="width: 80px">查询</Button>
+          <Button type="primary" style="width: 80px" @click="getTableData">查询</Button>
           <Button type="primary">批量添加</Button>
         </Col>
       </Row>
@@ -43,11 +45,13 @@
           </div>
         </template>
       </Table>
+      <Page align="right" :total="pageTotal" @on-change="pageChange" show-total />
     </Card>
   </div>
 </template>
 
 <script>
+import { queryPurchasePoolList } from "@/service/getData";
 export default {
   data() {
     return {
@@ -69,6 +73,7 @@ export default {
         ejfl: "", // 二级分类
         wlmc: "" //物料编码或名称
       },
+      ckList: [],
       yjflList: [
         { label: "1", value: "1" },
         { label: "2", value: "2" },
@@ -83,6 +88,8 @@ export default {
       wllxList: [],
       //   表格参数
       tableLoading: false,
+      pageTotal: 0,
+      pageNum: 1,
       tableColumn: [
         {
           type: "selection",
@@ -159,13 +166,22 @@ export default {
     //列表方法
     getTableData() {
       let postData = {
-        page: 1,
-        pageSize: 20,
-        firstClassId: 1,
-        areaId: 1,
-        projectId: 1,
-        storehouseId: 123
+        page: this.pageNum,
+        pageSize: 10,
+        firstClassId: this.searchForm.yjfl,
+        secondClassId: this.searchForm.ejfl,
+        areaIds: "",
+        queryText1: this.searchForm.wlmc,
+        queryText2: "",
+        projectIds: "",
+        storehouseId: this.searchForm.ck
       };
+      queryPurchasePoolList(postData).then(res => {
+        console.log(res);
+      });
+    },
+    pageChange(val) {
+      this.pageNum = val;
     },
     tableOnSelect(selection, row) {}
   }

src/service/getData.js

@@ -87,6 +87,13 @@ export const updateGoodProviderBankCard = (data) => fetch(`
 //申购计划 ---  获取申购计划列表
 export const queryPurchaseApplyList = (data) => fetch(`
 /purchaseApply/queryPurchaseApplyList`, '/purchase', data, 'JSON2', 'POST');
+/*
+ *采购管理
+ *待采购池模块接口
+ */
+//待采购池 --- 获取采购池列表
+export const queryPurchasePoolList = (data) => fetch(`
+/purchaseApply/queryPurchasePoolList`, '/purchase', data, 'JSON2', 'POST');
 /*
  *采购管理
  *采购订单模块接口