'change'

src/components/selectArticle.vue

@@ -6,12 +6,12 @@
       <Form :model="searchFormItem">
         <Row :gutter="10">
           <Col span="4">
-            <Select filterable  v-model="searchFormItem.areaId" placeholder="区域公司" @on-change="setProject">
+            <Select clearable filterable  v-model="searchFormItem.areaId" placeholder="区域公司" @on-change="setProject">
               <Option v-for="item in areaList" :value="item.areaId" :key="item.areaId">{{ item.areaName }}</Option>
             </Select>
           </Col>
           <Col span="4" v-if="showProject">
-            <Select filterable clearable v-model="searchFormItem.projectId" placeholder="项目名称">
+            <Select clearable filterable clearable v-model="searchFormItem.projectId" placeholder="项目名称">
               <Option v-for="item in projectList" :value="item.projectId" :key="item.projectId">{{ item.projectName }}
               </Option>
             </Select>

src/page/baseInfo/components/supply/supplyAdd.vue

@@ -29,7 +29,7 @@
           </Col>
           <Col span="4" class-name="tables">供应商分类</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.gysfl" style="width: 95%">
+            <Select clearable v-model="form.gysfl" style="width: 95%">
               <Option
                 v-for="item in gysflList"
                 :value="item.detailId"
@@ -39,7 +39,7 @@
           </Col>
           <Col span="4" class-name="tables">供应商评级</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.gyspj" style="width: 95%">
+            <Select clearable v-model="form.gyspj" style="width: 95%">
               <Option
                 v-for="item in gyspjList"
                 :value="item.detailId"
@@ -49,7 +49,7 @@
           </Col>
           <Col span="4" class-name="tables">所属区域</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.ssqy" placeholder="所属区域" style="width: 95%">
+            <Select clearable multiple v-model="form.ssqy" placeholder="所属区域" style="width: 95%">
               <Option
                 v-for="item in ssqyList"
                 :value="item.areaId"
@@ -59,7 +59,7 @@
           </Col>
           <Col span="4" class-name="tables">分管采购员</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.fgcgy" style="width: 95%">
+            <Select clearable v-model="form.fgcgy" style="width: 95%">
               <Option
                 v-for="item in fgcgyList"
                 :value="item.userId"
@@ -211,7 +211,7 @@ export default {
         gyslxdh: "", //供应商联系电话
         gysfl: "", //供应商分类
         gyspj: "", //供应商评级
-        ssqy: "", //所属区域
+        ssqy: [], //所属区域
         fgcgy: "", //分管采购员
         qyzt: "1", //启用状态
         clsj: "", //成立时间
@@ -275,7 +275,7 @@ export default {
       this.form.gyslxdh = "";
       this.form.gysfl = "";
       this.form.gyspj = "";
-      this.form.ssqy = "";
+      this.form.ssqy = [];
       this.form.fgcgy = "";
       this.form.qyzt = "1";
       this.form.clsj = "";
@@ -297,12 +297,38 @@ export default {
     },
     // 新增供应商
     addGys() {
-      // let arr = [];
-      // for (let i = 0; i < this.form.ssqy.length; i++) {
-      //   arr.push(
-      //     this.ssqyList.filter(a => a.areaId == this.form.ssqy[i])[0].areaName
-      //   );
-      // }
+       let mustArr = [
+        "gysmc",
+        "gysjc",
+        "gyslxr",
+        "gyslxdh",
+        "gysfl",
+        "gyspj",
+        "ssqy",
+        "fgcgy",
+        "clsj",
+        "frdb",
+        "swdjh",
+        "yyzz",
+        "dwxz",
+        "zczb",
+        "zcgm",
+        "zqts",
+        "zyyw",
+        "gysdz"
+      ];
+      for (let i in mustArr) {
+        if (this.form[mustArr[i]] == "" || this.form[mustArr[i]].length == 0) {
+          this.$Message.error("请将信息填写完整！");
+          return false;
+        }
+      }
+      let arr = [];
+      for (let i = 0; i < this.form.ssqy.length; i++) {
+        arr.push(
+          this.ssqyList.filter(a => a.areaId == this.form.ssqy[i])[0].areaName
+        );
+      }
       let data = {
         gpName: this.form.gysmc,
         gpAbbreviation: this.form.gysjc,
@@ -316,8 +342,8 @@ export default {
         gpGradeName: this.gyspjList.filter(
           a => a.detailId == this.form.gyspj
         )[0].detailName,
-        gpRegionId: this.form.ssqy,
-        gpRegionName: this.ssqyList.filter(a => a.areaId == this.form.ssqy)[0].areaName,
+        gpRegionId: this.form.ssqy.join(","),
+        gpRegionName: arr.join(","),
         gpBuyerId: this.form.fgcgy,
         gpBuyerName: this.fgcgyList.filter(a => a.userId == this.form.fgcgy)[0]
           .userName,
@@ -391,11 +417,12 @@ button {
   }
 }
 .mainCont .tables {
-  height: 50px;
+  min-height: 50px;
   border-right: 1px solid #e4e4e4;
   border-bottom: 1px solid #e4e4e4;
-  line-height: 50px;
-  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   &:nth-child(2n + 1) {
     background: #f8f9fb;
   }

src/page/baseInfo/components/supply/supplyEdit.vue

@@ -34,7 +34,7 @@
           </Col>
           <Col span="4" class-name="tables">供应商分类</Col>
           <Col span="4" class-name="tables">
-            <Select v-if="editing" v-model="form.gysfl" style="width: 95%">
+            <Select clearable v-if="editing" v-model="form.gysfl" style="width: 95%">
               <Option
                 v-for="item in gysflList"
                 :value="item.detailId"
@@ -45,7 +45,7 @@
           </Col>
           <Col span="4" class-name="tables">供应商评级</Col>
           <Col span="4" class-name="tables">
-            <Select v-if="editing" v-model="form.gyspj" style="width: 95%">
+            <Select clearable v-if="editing" v-model="form.gyspj" style="width: 95%">
               <Option
                 v-for="item in gyspjList"
                 :value="item.detailId"
@@ -56,18 +56,28 @@
           </Col>
           <Col span="4" class-name="tables">所属区域</Col>
           <Col span="4" class-name="tables">
-            <Select v-if="editing" v-model="form.ssqy" placeholder="所属区域" style="width: 95%">
+            <Select
+              clearable
+              multiple
+              v-if="editing"
+              v-model="form.ssqy"
+              placeholder="所属区域"
+              style="width: 95%"
+            >
               <Option
                 v-for="item in ssqyList"
                 :value="item.areaId"
                 :key="item.areaId"
               >{{ item.areaName }}</Option>
             </Select>
-            <div v-else>{{ssqyList.filter(a => a.areaId = form.ssqy)[0].areaName }}</div>
+            <div
+              v-else
+              v-for="(item, index) in form.ssqy"
+            >{{ssqyList.filter(a => a.areaId == item)[0].areaName }}</div>
           </Col>
           <Col span="4" class-name="tables">分管采购员</Col>
           <Col span="4" class-name="tables">
-            <Select v-if="editing" v-model="form.fgcgy" style="width: 95%">
+            <Select clearable v-if="editing" v-model="form.fgcgy" style="width: 95%">
               <Option
                 v-for="item in fgcgyList"
                 :value="item.userId"
@@ -314,6 +324,7 @@
           <Col span="6" class-name="tables">报价物品</Col>
           <Col span="6" class-name="tables">
             <Select
+              clearable
               v-model="xzbjForm.bjwp"
               @on-change="bjwpChange"
               style="width: 95%"
@@ -534,7 +545,7 @@ export default {
         zcgm: "", //资产规模
         zqts: "", //帐期天数
         cjsj: "", //创建时间
-        cjr: "", //创建人
+        cjr: localStorage.user_name, //创建人
         zyyw: "", //主营业务
         gysdz: "", //供应商地址
         bz: "", //备注
@@ -1254,7 +1265,7 @@ export default {
       this.form.zcgm = "";
       this.form.zqts = "";
       this.form.cjsj = "";
-      this.form.cjr = "";
+      this.form.cjr = localStorage.user_name;
       this.form.zyyw = "";
       this.form.gysdz = "";
       this.form.bz = "";
@@ -1271,7 +1282,6 @@ export default {
           if (res.status == 200) {
             let data = res.data;
             let arr = [];
-
             this.form.gysbm = data.gpNumber;
             this.form.gysmc = data.gpName;
             this.form.gysjc = data.gpAbbreviation;
@@ -1319,6 +1329,32 @@ export default {
     },
     //编辑数据上传
     editGys() {
+      let mustArr = [
+        "gysmc",
+        "gysjc",
+        "gyslxr",
+        "gyslxdh",
+        "gysfl",
+        "gyspj",
+        "ssqy",
+        "fgcgy",
+        "clsj",
+        "frdb",
+        "swdjh",
+        "yyzz",
+        "dwxz",
+        "zczb",
+        "zcgm",
+        "zqts",
+        "zyyw",
+        "gysdz"
+      ];
+      for (let i in mustArr) {
+        if (this.form[mustArr[i]] == "" || this.form[mustArr[i]].length == 0) {
+          this.$Message.error("请将信息填写完整！");
+          return false;
+        }
+      }
       let arr = [];
       for (let i = 0; i < this.form.ssqy.length; i++) {
         arr.push(
@@ -1339,9 +1375,8 @@ export default {
         gpGradeName: this.gyspjList.filter(
           a => a.detailId == this.form.gyspj
         )[0].detailName,
-        gpRegionId: this.form.ssqy,
-        gpRegionName: this.ssqyList.filter(a => a.areaId == this.form.ssqy)[0]
-          .areaName,
+        gpRegionId: this.form.ssqy.join(","),
+        gpRegionName: arr.join(","),
         gpBuyerId: this.form.fgcgy,
         gpBuyerName: this.fgcgyList.filter(a => a.userId == this.form.fgcgy)[0]
           .userName,
@@ -1403,11 +1438,12 @@ button {
   }
 }
 .mainCont .tables {
-  height: 50px;
+  min-height: 50px;
   border-right: 1px solid #e4e4e4;
   border-bottom: 1px solid #e4e4e4;
-  line-height: 50px;
-  text-align: center;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   &:nth-child(2n + 1) {
     background: #f8f9fb;
   }

src/page/baseInfo/supply.vue

@@ -9,7 +9,13 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="6">
-          <Select v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
+          <Select
+            clearable
+            v-model="searchForm.ssqy"
+            placeholder="所属区域"
+            @on-change="ssqyChange"
+            multiple
+          >
             <Option
               v-for="item in ssqyList"
               :value="item.areaId"
@@ -18,7 +24,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.gysfl" placeholder="供应商分类">
+          <Select clearable v-model="searchForm.gysfl" placeholder="供应商分类">
             <Option
               v-for="item in gysflList"
               :value="item.detailId"
@@ -27,7 +33,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.gyspj" placeholder="供应商评级">
+          <Select clearable v-model="searchForm.gyspj" placeholder="供应商评级">
             <Option
               v-for="item in gyspjList"
               :value="item.detailId"
@@ -47,7 +53,7 @@
           <Input v-model="searchForm.lxr" placeholder="供应商联系人或联系电话" />
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.fgcgy" placeholder="分管采购员">
+          <Select clearable v-model="searchForm.fgcgy" placeholder="分管采购员">
             <Option
               v-for="item in fgcgyList"
               :value="item.userId"
@@ -56,7 +62,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.qyzt" placeholder="启用状态">
+          <Select clearable v-model="searchForm.qyzt" placeholder="启用状态">
             <Option v-for="item in qyztList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
@@ -135,7 +141,7 @@ export default {
       handleWidth: 100,
       //   查询参数
       searchForm: {
-        ssqy: "", //所属区域
+        ssqy: [], //所属区域
         gysfl: "", //供应商分类
         gyspj: "", //供应商评级
         gysbh: "", //供应商编号

src/page/home/indexArea.vue

@@ -1,12 +1,12 @@
 <template>
 	<div>
-		<Select class="selectArea" v-model="areaId" size="small" style="width:200px" @on-change="selectChange">
+		<Select clearable class="selectArea" v-model="areaId" size="small" style="width:200px" @on-change="selectChange">
 			<Option v-for="(item,index) in areaList" :value="item.areaId" :key="index">{{ item.areaName }}</Option>
 		</Select>
-		<Select class="selectMothPosition" v-model="queryTime" size="small" style="width:100px" @on-change="selectChange">
+		<Select clearable class="selectMothPosition" v-model="queryTime" size="small" style="width:100px" @on-change="selectChange">
 			<Option v-for="item in queryTimeList" :value="item.value" :key="item.value">{{ item.label }}</Option>
 		</Select>
-		<Select class="selectPosition" v-model="biProblemCategory" size="small" style="width:100px" @on-change="selectChange">
+		<Select clearable class="selectPosition" v-model="biProblemCategory" size="small" style="width:100px" @on-change="selectChange">
 			<Option v-for="item in biList" :value="item.value" :key="item.value">{{ item.label }}</Option>
 		</Select>
 		<Row :gutter="10">

src/page/home/indexEdit.vue

@@ -9,12 +9,12 @@
 		</Tabs>
 		<Row :gutter="10">
 					<Col :span="6">
-					<Select v-model="search.areaId" placeholder="区域" @on-change="getProjectList">
+					<Select clearable v-model="search.areaId" placeholder="区域" @on-change="getProjectList">
 						<Option v-for="(item, index) in areaList" :value="item.areaId" :key="index">{{ item.areaName }}</Option>
 					</Select>
 					</Col>
 					<Col :span="6">
-					<Select v-model="search.projectId" placeholder="项目" clearable>
+					<Select clearable v-model="search.projectId" placeholder="项目" clearable>
 						<Option v-for="(item, index) in projectList" :value="item.projectId" :key="index">{{ item.projectName }}</Option>
 					</Select>
 					</Col>

src/page/home/indexPerson.vue

@@ -1,20 +1,20 @@
 <template>
 	<div>
 		<div class="selectStyle" style="text-align: right;">
-			<!--<Select class="selectItemStyle" v-model="areaId" @on-change="setProject">
+			<!--<Select clearable class="selectItemStyle" v-model="areaId" @on-change="setProject">
 				<Option v-for="(item,index) in areaList" :value="item.areaId" :key="index">{{ item.areaName }}</Option>
 			</Select>-->
-			<Select class="selectItemStyle" clearable v-model="projectId" placeholder="项目名称" @on-change="setRange">
+			<Select clearable class="selectItemStyle" clearable v-model="projectId" placeholder="项目名称" @on-change="setRange">
 				<Option v-for="item in projectList" :value="item.projectId" :key="item.projectId">{{ item.projectName }}</Option>
 			</Select>
-			<Select v-if="!userShow" class="selectItemStyle" v-model="userType" @on-change="setMember">
+			<Select clearable v-if="!userShow" class="selectItemStyle" v-model="userType" @on-change="setMember">
 		    	<Option value="1">我处理的</Option>
             	<Option value="2">我受理的</Option>
 			</Select>
-			<Select v-if="userShow" class="selectItemStyle" filterable v-model="origUser" placeholder="受理人" clearable @on-change="selectChange">
+			<Select clearable v-if="userShow" class="selectItemStyle" filterable v-model="origUser" placeholder="受理人" clearable @on-change="selectChange">
 				<Option v-for="(item,index) in userList2" :value="item.userId" :key="index+item.userId">{{ item.userName }}</Option>
 			</Select>
-			<Select v-if="userShow" class="selectItemStyle" filterable v-model="followUpProcessor" placeholder="处理人" clearable @on-change="selectChange">
+			<Select clearable v-if="userShow" class="selectItemStyle" filterable v-model="followUpProcessor" placeholder="处理人" clearable @on-change="selectChange">
 				<Option v-for="(item,index) in userList" :value="item.userId" :key="index+item.userId">{{ item.userName }}</Option>
 			</Select>
 			<Date-picker :clearable="false" class="selectItemStyle" style="width:190px!important" type="daterange" v-model="submitDate" title="受理时间" placeholder="受理时间" @on-change="setSubmitDate"></Date-picker>

src/page/purchase/components/balance/balanceAdd.vue

@@ -6,7 +6,10 @@
         <p slot="title">采购结算详情</p>
         <div slot="extra">
           <Button @click="addJs">保存</Button>
-          <Button v-if="balanceType == 'edit' && (form.spzt == '1' || form.spzt == '4')">提交</Button>
+          <Button
+            @click="submitJs"
+            v-if="balanceType == 'edit' && (form.spzt == '1' || form.spzt == '4')"
+          >提交</Button>
           <Button @click="cancel">取消</Button>
         </div>
         <Row class="mainCont">
@@ -20,6 +23,7 @@
           </Col>
           <Col span="4" class-name="tables">
             <Select
+              clearable
               v-model="form.glqy"
               :disabled="balanceType == 'edit'"
               @on-change="glqyChange"
@@ -37,7 +41,12 @@
             <span class="mustSpan">*</span>
           </Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.glxm" :disabled="balanceType == 'edit'" style="width: 95%">
+            <Select
+              clearable
+              v-model="form.glxm"
+              :disabled="balanceType == 'edit'"
+              style="width: 95%"
+            >
               <Option
                 v-for="item in glxmList"
                 :value="item.projectId"
@@ -52,7 +61,13 @@
             <span class="mustSpan">*</span>
           </Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.gys" filterable style="width: 95%" @on-change="gysChange">
+            <Select
+              clearable
+              v-model="form.gys"
+              filterable
+              style="width: 95%"
+              @on-change="gysChange"
+            >
               <Option v-for="item in gysList" :value="item.gpId" :key="item.gpId">{{ item.gpName }}</Option>
             </Select>
           </Col>
@@ -79,7 +94,7 @@
             <span class="mustSpan">*</span>
           </Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.djlx" style="width: 95%">
+            <Select clearable v-model="form.djlx" style="width: 95%">
               <Option
                 v-for="item in djlxList"
                 :value="item.value"
@@ -394,6 +409,10 @@ export default {
         areaName: this.glqyList.filter(a => a.areaId == this.form.glqy)[0]
           .areaName,
         supplierId: this.form.gys,
+        supplierCode: this.gysList.filter(a => a.gpId == this.form.gys)[0]
+          .gpNumber,
+        supplierName: this.gysList.filter(a => a.gpId == this.form.gys)[0]
+          .gpName,
         supplierPrincipal: this.form.gffzr,
         supplierTel: this.form.gyslxdh,
         depositBank: this.form.khh,
@@ -424,6 +443,10 @@ export default {
         areaName: this.glqyList.filter(a => a.areaId == this.form.glqy)[0]
           .areaName,
         supplierId: this.form.gys,
+        supplierCode: this.gysList.filter(a => a.gpId == this.form.gys)[0]
+          .gpNumber,
+        supplierName: this.gysList.filter(a => a.gpId == this.form.gys)[0]
+          .gpName,
         supplierPrincipal: this.form.gffzr,
         supplierTel: this.form.gyslxdh,
         depositBank: this.form.khh,
@@ -448,10 +471,6 @@ export default {
     },
     //新增结算
     addJs() {
-      if (this.balanceType == "edit") {
-        this.editJs();
-        return false;
-      }
       let mArr = ["glqy", "glxm", "gys", "khh", "zh", "djlx", "sqr"];
       for (let item in mArr) {
         let it = mArr[item];
@@ -460,6 +479,10 @@ export default {
           return false;
         }
       }
+      if (this.balanceType == "edit") {
+        this.editJs();
+        return false;
+      }
       let postData = {
         areaId: this.form.glqy,
         projectId: this.form.glxm,
@@ -468,6 +491,11 @@ export default {
         projectName: this.glxmList.filter(a => a.projectId == this.form.glxm)[0]
           .projectName,
         supplierId: this.form.gys,
+        supplierCode: this.form.this.gysList.filter(
+          a => a.gpId == this.form.gys
+        )[0].gpNumber,
+        supplierName: this.gysList.filter(a => a.gpId == this.form.gys)[0]
+          .gpName,
         supplierPrincipal: this.form.gffzr,
         supplierTel: this.form.gyslxdh,
         depositBank: this.form.khh,

src/page/purchase/components/balance/balanceMxAdd.vue

@@ -7,7 +7,7 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="addForm.ssxm" placeholder="项目名称" style="width: 95%">
+          <Select clearable v-model="addForm.ssxm" placeholder="项目名称" style="width: 95%">
             <Option
               disabled
               v-for="item in ssxmList"
@@ -160,8 +160,8 @@ export default {
     //列表方法
     getTableData() {
       let postData = {
-        // projectId: this.addForm.ssxm,
-        projectId: 10,
+        projectId: this.addForm.ssxm,
+        // projectId: 10,
         orderTimeStart: this.addForm.xdsj[0],
         orderTimeEnd: this.addForm.xdsj[1],
         storehouseTimeStart: this.addForm.rksj[0],

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

@@ -29,6 +29,7 @@
           <Col span="4" class-name="tables">关联区域</Col>
           <Col span="4" class-name="tables">
             <Select
+              clearable
               v-model="form.glqy"
               style="width: 95%"
               v-if="orderType == 'add'"
@@ -45,7 +46,7 @@
           </Col>
           <Col span="4" class-name="tables">关联项目</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.glxm" style="width: 95%" v-if="orderType == 'add'">
+            <Select clearable v-model="form.glxm" style="width: 95%" v-if="orderType == 'add'">
               <Option
                 v-for="item in glxmList"
                 :value="item.projectId + ',' + item.projectName"
@@ -57,7 +58,7 @@
           </Col>
           <Col span="4" class-name="tables">单据类型</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.djlx" style="width: 95%">
+            <Select clearable v-model="form.djlx" style="width: 95%">
               <Option
                 v-for="item in djlxList"
                 :value="item.value"
@@ -126,6 +127,7 @@
           <Col span="4" class-name="tables">供应商</Col>
           <Col span="12" class-name="tables">
             <Select
+              clearable
               v-model="form.gys"
               @on-change="gysChange"
               filterable
@@ -194,7 +196,7 @@
           </Col>
           <Col span="10" class="upl" style="padding: 5px">
             <div v-for="(item, index) in form.filesList" :key="index">
-              <a href="javascript:;">{{ item.fullName }}</a>
+              <a href="javascript:;">{{ item.fileName }}</a>
               <span style="float: right; cursor:pointer" @click="form.filesList.splice(index, 1)">x</span>
             </div>
             <p v-if="uploading" style="text-align: center">上传中...</p>
@@ -276,6 +278,9 @@
               </Radio>
             </RadioGroup>
           </template>
+          <template slot-scope="{ row, index }" slot="remark">
+            <Input v-model="tableData[index].remark" placeholder="请输入" style="width: 95%" />
+          </template>
           <template slot-scope="{ row, index }" slot="cz">
             <div>
               <a href="javascript:;" v-if="form.spzt != '2'" @click="deleteRow(index)">删除</a>
@@ -287,7 +292,7 @@
         <Row class="mainCont">
           <Col span="12" class-name="tables">入库仓库</Col>
           <Col span="12" class-name="tables">
-            <Select v-model="plrkck" style="width: 95%" :transfer="true">
+            <Select clearable v-model="plrkck" style="width: 95%" :transfer="true">
               <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Col>
@@ -318,7 +323,8 @@ import {
   editPurchaseOrder,
   getLabelByCode,
   getProjectList,
-  submitPurchaseOrder
+  submitPurchaseOrder,
+  getLabelByCode4Purchase
 } from "@/service/getData";
 import orderMxAdd from "./orderMxAdd";
 export default {
@@ -487,6 +493,12 @@ export default {
           tooltip: "true",
           width: 100
         },
+        {
+          title: "备注",
+          slot: "remark",
+          tooltip: "true",
+          width: 100
+        },
         {
           title: "操作",
           slot: "cz",
@@ -502,7 +514,7 @@ export default {
     };
   },
   created() {
-    getLabelByCode({ dictCode: "billType" }).then(res => {
+    getLabelByCode4Purchase({ dictCode: "billType" }).then(res => {
       if (res.status == 200) {
         this.djlxList = res.data;
       } else {
@@ -526,7 +538,7 @@ export default {
       this.uploading = false;
       this.form.filesList.push({
         fileName: response.data.fileName,
-        resPath: response.data.filePath,
+        filePath: response.data.filePath,
         fileDetailType: ""
       });
     },
@@ -676,6 +688,22 @@ export default {
     },
     //新增采购订单
     addCgdd() {
+      let mustArr = [
+        "glqy",
+        "glxm",
+        "djlx",
+        "xdrq",
+        "jhsj",
+        "shr",
+        "shrlxfs",
+        "gys"
+      ];
+      for (let i in mustArr) {
+        if (this.form[mustArr[i]] == "" || this.form[mustArr[i]].length == 0) {
+          this.$Message.error("请将信息填写完整！");
+          return false;
+        }
+      }
       if (this.orderType == "edit") {
         this.editCgdd();
         return false;

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

@@ -7,17 +7,17 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="searchForm.ck" placeholder="仓库名">
+          <Select clearable v-model="searchForm.ck" placeholder="仓库名">
             <Option v-for="item in ckList" :value="item.twId" :key="item.twId">{{ item.twName }}</Option>
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.yjfl" placeholder="一级分类" @on-change="yjflChange">
+          <Select clearable v-model="searchForm.yjfl" placeholder="一级分类" @on-change="yjflChange">
             <Option v-for="item in yjflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.ejfl" placeholder="二级分类">
+          <Select clearable v-model="searchForm.ejfl" placeholder="二级分类">
             <Option v-for="item in ejflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
@@ -190,8 +190,8 @@ export default {
         areaIds: this.areaId.split(',')[0],
         queryText1: this.searchForm.wlmc,
         queryText2: "",
-        // projectIds: this.projectId.split(',')[0],
-        projectIds: 10,
+        projectIds: this.projectId.split(',')[0],
+        // projectIds: 10,
         storehouseId: this.searchForm.ck
       };
       queryPurchasePoolList(postData).then(res => {

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

@@ -60,7 +60,7 @@
             </tr>
           </thead>
           <tbody>
-            <tr v-for="(item, index) in printData.detailList" :key="item">
+            <tr v-for="(item, index) in printData.detailList" :key="index">
               <td>{{ index + 1 }}</td>
               <td>{{ item.applyRuleCode }}</td>
               <td>{{ item.detailList[0].materialName }}</td>
@@ -105,7 +105,7 @@
                 </p>
                 <p>5、供方如向我司相关人员行贿或所供产品出现规格、数量与送货单不符、以假充真等情形的，我司有权按该产品金额“以一罚十”标准要求乙方承担违约责任；如发现有假发票，我司将有权不给予付款并追究其相关法律责任。</p>
                 <p>6、以上价格已含增值税专用发票3%，发票抬头：东莞市光大物业管理有限公司。</p>
-                <p>7、备注：订单日期{{ printData.orderTime.split(' ')[0] }}</p>
+                <p>7、备注：订单日期{{ printData.orderTime ? printData.orderTime.split(' ')[0] : "" }}</p>
               </td>
             </tr>
           </tbody>

src/page/purchase/components/plan/planAdd.vue

@@ -6,7 +6,10 @@
         <p slot="title">申购计划详情</p>
         <div slot="extra">
           <Button @click="addSgjh">保存</Button>
-          <Button @click="submitSgjh" v-if="planType == 'edit' && (form.spzt == '0' || form.spzt == '4')">提交</Button>
+          <Button
+            @click="submitSgjh"
+            v-if="planType == 'edit' && (form.spzt == '0' || form.spzt == '4')"
+          >提交</Button>
           <Button @click="cancel">取消</Button>
         </div>
         <Row class="mainCont">
@@ -15,6 +18,7 @@
           <Col span="4" class-name="tables">所属区域</Col>
           <Col span="4" class-name="tables">
             <Select
+              clearable
               v-model="form.ssqy"
               style="width: 95%"
               @on-change="ssqyChange"
@@ -29,7 +33,7 @@
           </Col>
           <Col span="4" class-name="tables">所属项目</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.ssxm" style="width: 95%" :disabled="planType == 'edit'">
+            <Select clearable v-model="form.ssxm" style="width: 95%" :disabled="planType == 'edit'">
               <Option
                 v-for="item in ssxmList"
                 :value="item.projectId + ',' + item.projectName"
@@ -43,7 +47,7 @@
           <Col span="4" class-name="tables">{{ form.totalPrice }}</Col>
           <Col span="4" class-name="tables">计划类型</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.jhlx" style="width: 95%">
+            <Select clearable v-model="form.jhlx" style="width: 95%">
               <Option
                 v-for="item in jhlxList"
                 :value="item.value"
@@ -64,7 +68,7 @@
           </Col>
           <Col span="4" class-name="tables">分管采购员</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.fgcgy" style="width: 95%">
+            <Select clearable v-model="form.fgcgy" style="width: 95%">
               <Option
                 v-for="item in cgyList"
                 :value="item.userId + ',' + item.userName"
@@ -146,7 +150,12 @@
             </div>
           </template>
           <template slot-scope="{ row, index }" slot="storehouseId">
-            <Select v-model="tableData[index].storehouseId" style="width: 95%" :transfer="true">
+            <Select
+              clearable
+              v-model="tableData[index].storehouseId"
+              style="width: 95%"
+              :transfer="true"
+            >
               <Option v-for="item in ckList" :value="item.twId" :key="item.twId">{{ item.twName }}</Option>
             </Select>
           </template>
@@ -154,7 +163,12 @@
             <span>{{ row.linkedPersonName }}</span>
           </template>
           <template slot-scope="{ row, index }" slot="billType">
-            <Select v-model="tableData[index].billType" style="width: 95%" :transfer="true">
+            <Select
+              clearable
+              v-model="tableData[index].billType"
+              style="width: 95%"
+              :transfer="true"
+            >
               <Option v-for="item in djList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </template>
@@ -187,7 +201,7 @@
         <Row class="mainCont">
           <Col span="12" class-name="tables">入库仓库</Col>
           <Col span="12" class-name="tables">
-            <Select v-model="plrkck" style="width: 95%" :transfer="true">
+            <Select clearable v-model="plrkck" style="width: 95%" :transfer="true">
               <Option v-for="item in ckList" :value="item.twId" :key="item.twId">{{ item.twName }}</Option>
             </Select>
           </Col>
@@ -355,8 +369,8 @@ export default {
         {
           title: "备注",
           slot: "remark",
-          tooltip: "true",
-          width: 100
+          tooltip: "true"
+          // width: 100
         },
         {
           title: "操作",
@@ -439,6 +453,9 @@ export default {
           };
           warehouseList(getData).then(res => {
             if (res.status == 200) {
+              for (let i in res.data) {
+                res.data[i].twId = Number(res.data[i].twId);
+              }
               this.ckList = res.data;
             }
           });
@@ -448,6 +465,13 @@ export default {
     },
     //新增申购计划
     addSgjh() {
+      let mustArr = ["ssqy", "ssxm", "jhlx", "jhyf", "fgcgy"];
+      for (let i in mustArr) {
+        if (this.form[mustArr[i]] == "" || this.form[mustArr[i]].length == 0) {
+          this.$Message.error("请将信息填写完整！");
+          return false;
+        }
+      }
       if (this.planType == "add") {
         let postData = {
           areaId: this.form.ssqy.split(",")[0],

src/page/purchase/components/plan/planEdit.vue

@@ -14,7 +14,7 @@
           <Col span="4" class-name="tables">计算属性</Col>
           <Col span="4" class-name="tables">所属区域</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.ssqy" style="width: 95%">
+            <Select clearable v-model="form.ssqy" style="width: 95%">
               <Option
                 v-for="item in ssqyList"
                 :value="item.value"
@@ -24,7 +24,7 @@
           </Col>
           <Col span="4" class-name="tables">所属项目</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.ssxm" style="width: 95%">
+            <Select clearable v-model="form.ssxm" style="width: 95%">
               <Option
                 v-for="item in ssxmList"
                 :value="item.value"
@@ -38,7 +38,7 @@
           <Col span="4" class-name="tables">计算属性</Col>
           <Col span="4" class-name="tables">计划类型</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.jhlx" style="width: 95%">
+            <Select clearable v-model="form.jhlx" style="width: 95%">
               <Option
                 v-for="item in jhlxList"
                 :value="item.value"
@@ -59,13 +59,13 @@
           </Col>
           <Col span="4" class-name="tables">分管采购员</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.fgcgy" style="width: 95%">
+            <Select clearable v-model="form.fgcgy" style="width: 95%">
               <Option v-for="item in cgyList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Col>
           <Col span="4" class-name="tables">申请人</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.sqr" style="width: 95%">
+            <Select clearable v-model="form.sqr" style="width: 95%">
               <Option v-for="item in sqrList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Col>
@@ -132,7 +132,7 @@
             </div>
           </template>
           <template slot-scope="{ row, index }" slot="rkck">
-            <Select v-model="tableData[index].rkck" style="width: 95%" :transfer="true">
+            <Select clearable v-model="tableData[index].rkck" style="width: 95%" :transfer="true">
               <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </template>
@@ -142,7 +142,7 @@
             </div>
           </template>
           <template slot-scope="{ row, index }" slot="djlx">
-            <Select v-model="tableData[index].rkck" style="width: 95%" :transfer="true">
+            <Select clearable v-model="tableData[index].rkck" style="width: 95%" :transfer="true">
               <Option v-for="item in djList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </template>
@@ -172,7 +172,7 @@
         <Row class="mainCont">
           <Col span="12" class-name="tables">入库仓库</Col>
           <Col span="12" class-name="tables">
-            <Select v-model="plrkck" style="width: 95%" :transfer="true">
+            <Select clearable v-model="plrkck" style="width: 95%" :transfer="true">
               <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Col>

src/page/purchase/components/plan/planMxAdd.vue

@@ -7,12 +7,12 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="5">
-          <Select v-model="searchForm.yjfl" @on-change="yjflChange" placeholder="一级分类">
+          <Select clearable v-model="searchForm.yjfl" @on-change="yjflChange" placeholder="一级分类">
             <Option v-for="item in yjflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
         <Col span="5">
-          <Select v-model="searchForm.ejfl" placeholder="二级分类">
+          <Select clearable v-model="searchForm.ejfl" placeholder="二级分类">
             <Option v-for="item in ejflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
@@ -54,7 +54,7 @@
         </Col>
         <Col span="6" class-name="tables">物料一级分类</Col>
         <Col span="6" class-name="tables">
-          <Select
+          <Select clearable
             v-model="addForm.yjfl"
             style="width: 95%"
             @on-change="addYjflChange"
@@ -65,7 +65,7 @@
         </Col>
         <Col span="6" class-name="tables">物料二级分类</Col>
         <Col span="6" class-name="tables">
-          <Select v-model="addForm.ejfl" style="width: 95%" :transfer="true">
+          <Select clearable v-model="addForm.ejfl" style="width: 95%" :transfer="true">
             <Option
               v-for="item in addEjflList"
               :value="item.gcId"
@@ -75,7 +75,7 @@
         </Col>
         <Col span="6" class-name="tables">计量单位</Col>
         <Col span="6" class-name="tables">
-          <Select v-model="addForm.jldw" style="width: 95%" :transfer="true">
+          <Select clearable v-model="addForm.jldw" style="width: 95%" :transfer="true">
             <Option v-for="item in jldwList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
@@ -85,7 +85,7 @@
         </Col>
         <Col span="6" class-name="tables">物料类型</Col>
         <Col span="6" class-name="tables">
-          <Select v-model="addForm.wllx" style="width: 95%" :transfer="true">
+          <Select clearable v-model="addForm.wllx" style="width: 95%" :transfer="true">
             <Option v-for="item in wllxList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
@@ -274,8 +274,8 @@ export default {
         gcId: this.searchForm.ejfl,
         sgNo: "",
         sgName: "",
-        // projectId: this.projectId.split(',')[0]
-        projectId: 10
+        projectId: this.projectId.split(',')[0]
+        // projectId: 10
         // queryText1: this.searchForm.wlmc
         // projectIds: this.projectId.split(',')[0]
       };
@@ -308,7 +308,6 @@ export default {
           arriveTime: dateStr, //待确认  预测为计划到货时间
           linkedPersonId: localStorage.user_id,
           linkedPersonName: localStorage.user_name, //待确认
-          // materialCode: this.tableSelect[item].sgNo,
           // firstClassName: this.tableSelect[item].gcName,
           // firstClassId: this.tableSelect[item].gcId,
           // secondClassId: this.tableSelect[item].gcTwoId,
@@ -327,7 +326,7 @@ export default {
           storehouseName: "", //入库仓库  主界面选择
           // storehouseId: this.tableSelect[item].storehouseId, //入库仓库ID  主界面选择
           // storehouseName: this.tableSelect[item].storehouseName, //入库仓库  主界面选择
-          remark: this.tableSelect[item].sgMark
+          remark: ""
         });
       }
       this.$emit("plAdd", arr);

src/page/purchase/components/pool/poolAdd.vue

@@ -5,10 +5,10 @@
       <Card style="width:100%" :bordered="false" :dis-hover="true">
         <p slot="title">采购订单详情</p>
         <div slot="extra">
-          <Button
+          <!-- <Button
             @click="submitCgdd"
             v-if="(orderType == 'edit') && (form.spzt == '1' || form.spzt == '4')"
-          >提交</Button>
+          >提交</Button>-->
           <Button @click="addCgdd" v-if="form.spzt == '1' || form.spzt == '' || form.spzt == '4'">保存</Button>
           <Button @click="cancel">取消</Button>
         </div>
@@ -29,6 +29,7 @@
           <Col span="4" class-name="tables">关联区域</Col>
           <Col span="4" class-name="tables">
             <Select
+              clearable
               v-model="form.glqy"
               style="width: 95%"
               v-if="orderType == 'add'"
@@ -46,6 +47,7 @@
           <Col span="4" class-name="tables">关联项目</Col>
           <Col span="4" class-name="tables">
             <Select
+              clearable
               v-model="form.glxm"
               style="width: 95%"
               v-if="orderType == 'add'"
@@ -61,7 +63,7 @@
           </Col>
           <Col span="4" class-name="tables">单据类型</Col>
           <Col span="4" class-name="tables">
-            <Select v-model="form.djlx" style="width: 95%">
+            <Select clearable v-model="form.djlx" style="width: 95%">
               <Option
                 v-for="item in djlxList"
                 :value="item.value"
@@ -130,6 +132,7 @@
           <Col span="4" class-name="tables">供应商</Col>
           <Col span="12" class-name="tables">
             <Select
+              clearable
               v-model="form.gys"
               @on-change="gysChange"
               filterable
@@ -198,7 +201,7 @@
           </Col>
           <Col span="10" class="upl" style="padding: 5px">
             <div v-for="(item, index) in form.filesList" :key="index">
-              <a href="javascript:;">{{ item.fullName }}</a>
+              <a :href="item.filePath" :download="item.fileName" target="_blank">{{ item.fileName }}</a>
               <span style="float: right; cursor:pointer" @click="form.filesList.splice(index, 1)">x</span>
             </div>
             <p v-if="uploading" style="text-align: center">上传中...</p>
@@ -291,7 +294,7 @@
         <Row class="mainCont">
           <Col span="12" class-name="tables">入库仓库</Col>
           <Col span="12" class-name="tables">
-            <Select v-model="plrkck" style="width: 95%" :transfer="true">
+            <Select clearable v-model="plrkck" style="width: 95%" :transfer="true">
               <Option v-for="item in ckList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Col>
@@ -322,7 +325,8 @@ import {
   editPurchaseOrder,
   getLabelByCode,
   getProjectList,
-  submitPurchaseOrder
+  submitPurchaseOrder,
+  getLabelByCode4Purchase
 } from "@/service/getData";
 import poolMxAdd from "./poolMxAdd";
 export default {
@@ -371,11 +375,9 @@ export default {
           return date && date.valueOf() < new Date(this.form.xdrq);
         }
       },
-      // glqyList: [{ label: "test", value: 1 }],
       glxmList: [],
       cgrList: [{ label: "test", value: 1 }],
       djlxList: [],
-      // gysList: [{ label: "test", value: 1 }],
       gffzrList: [{ label: "test", value: 1 }],
       uploading: false,
       // 批量设置
@@ -507,7 +509,7 @@ export default {
     };
   },
   created() {
-    getLabelByCode({ dictCode: "billType" }).then(res => {
+    getLabelByCode4Purchase({ dictCode: "billType" }).then(res => {
       if (res.status == 200) {
         this.djlxList = res.data;
       } else {
@@ -531,11 +533,28 @@ export default {
       this.uploading = false;
       this.form.filesList.push({
         fileName: response.data.fileName,
-        resPath: response.data.filePath,
+        filePath: response.data.filePath,
         fileDetailType: ""
       });
     },
-    getData(areaId, projectId, lazyTableData) {},
+    getData(areaId, projectId, lazyTableData) {
+      this.lazyTableData = lazyTableData;
+      this.form.glqy =
+        Number(areaId) +
+        "," +
+        this.glqyList.filter(a => a.areaId == areaId)[0].areaName;
+      let postData = {
+        areaId: areaId,
+        userId: localStorage.user_id
+      };
+      getProjectList(postData).then(res => {
+        this.glxmList = res.items;
+        this.form.glxm =
+          projectId +
+          "," +
+          res.items.filter(a => a.projectId == projectId)[0].projectName;
+      });
+    },
     //供应商切换
     gysChange(val) {
       let gys = this.gysList.filter(a => a.gpId == val)[0];
@@ -544,6 +563,9 @@ export default {
     },
     //所属区域切换
     ssqyChange() {
+      if (!this.form.glqy) {
+        return false;
+      }
       let postData = {
         areaId: this.form.glqy.split(",")[0],
         userId: localStorage.user_id
@@ -595,6 +617,22 @@ export default {
     },
     //新增采购订单
     addCgdd() {
+      let mustArr = [
+        "glqy",
+        "glxm",
+        "djlx",
+        "xdrq",
+        "jhsj",
+        "shr",
+        "shrlxfs",
+        "gys"
+      ];
+      for (let i in mustArr) {
+        if (this.form[mustArr[i]] == "" || this.form[mustArr[i]].length == 0) {
+          this.$Message.error("请将信息填写完整！");
+          return false;
+        }
+      }
       if (this.orderType == "edit") {
         this.editCgdd();
         return false;
@@ -629,6 +667,7 @@ export default {
           this.form.dgbh = res.data.orderCode;
           this.form.bt = res.data.title;
           this.form.jhdd = res.data.deliveryPlace;
+          this.plAdd(this.lazyTableData);
           this.orderType = "edit";
         } else {
           this.$Message.error(res.message);

src/page/purchase/components/pool/poolMxAdd.vue

@@ -7,17 +7,17 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="searchForm.ck" placeholder="仓库名">
+          <Select clearable v-model="searchForm.ck" placeholder="仓库名">
             <Option v-for="item in ckList" :value="item.twId" :key="item.twId">{{ item.twName }}</Option>
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.yjfl" placeholder="一级分类" @on-change="yjflChange">
+          <Select clearable v-model="searchForm.yjfl" placeholder="一级分类" @on-change="yjflChange">
             <Option v-for="item in yjflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.ejfl" placeholder="二级分类">
+          <Select clearable v-model="searchForm.ejfl" placeholder="二级分类">
             <Option v-for="item in ejflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
@@ -190,8 +190,8 @@ export default {
         areaIds: this.areaId.split(',')[0],
         queryText1: this.searchForm.wlmc,
         queryText2: "",
-        // projectIds: this.projectId.split(',')[0],
-        projectIds: 10,
+        projectIds: this.projectId.split(',')[0],
+        // projectIds: 10,
         storehouseId: this.searchForm.ck
       };
       queryPurchasePoolList(postData).then(res => {

src/page/purchase/purchaseBalance.vue

@@ -9,7 +9,7 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
+          <Select clearable v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
             <Option
               v-for="item in ssqyList"
               :value="item.areaId"
@@ -18,7 +18,7 @@
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
+          <Select clearable v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
             <Option
               v-for="item in glxmList"
               :value="item.projectId"
@@ -27,7 +27,7 @@
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.gys" placeholder="供应商">
+          <Select clearable v-model="searchForm.gys" placeholder="供应商">
             <Option v-for="item in gysList" :value="item.gpId" :key="item.gpId">{{ item.gpName }}</Option>
           </Select>
         </Col>
@@ -36,22 +36,22 @@
         </Col>
         <Col span="4">
           <DatePicker
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
             :value="searchForm.xdsj"
             @on-change="searchForm.xdsj=$event"
-            type="daterange"
+            type="datetimerange"
             placeholder="下单时间"
           ></DatePicker>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.djlx" placeholder="单据类型">
+          <Select clearable v-model="searchForm.djlx" placeholder="单据类型">
             <Option v-for="item in djlxList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
       </Row>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="searchForm.spzt" placeholder="审批状态">
+          <Select clearable v-model="searchForm.spzt" placeholder="审批状态">
             <Option v-for="item in spztList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
@@ -113,7 +113,8 @@ import {
   getAreaList,
   getProjectList,
   getLabelByCode,
-  selectGoodProviderSelectionList
+  selectGoodProviderSelectionList,
+  getLabelByCode4Purchase
 } from "@/service/getData";
 import balanceAdd from "./components/balance/balanceAdd";
 import balancePrint from "./components/balance/newBPrint";
@@ -132,8 +133,8 @@ export default {
       handleWidth: 100,
       //   查询参数
       searchForm: {
-        ssqy: [], //所属区域
-        glxm: [], //关联项目
+        ssqy: "", //所属区域
+        glxm: "", //关联项目
         gys: "", //供应商
         sgr: "", //申购人
         xdsj: "", //下单时间
@@ -260,7 +261,7 @@ export default {
     getAreaList(localStorage.user_id).then(res => {
       this.ssqyList = res.items;
     });
-    getLabelByCode({ dictCode: "billType" }).then(res => {
+    getLabelByCode4Purchase({ dictCode: "billType" }).then(res => {
       this.djlxList = res.data;
     });
   },
@@ -284,8 +285,8 @@ export default {
     //导出明细
     exportData() {
       let postData = {
-        areaIds: this.searchForm.ssqy.join(","),
-        projectIds: this.searchForm.glxm.join(","),
+        areaIds: this.searchForm.ssqy,
+        projectIds: this.searchForm.glxm,
         supplierId: this.searchForm.gys,
         applicantId: this.searchForm.sgr,
         orderTimeStart: this.searchForm.xdsj[0],
@@ -302,8 +303,8 @@ export default {
       let postData = {
         page: this.pageNum,
         pageSize: 10,
-        areaIds: this.searchForm.ssqy.join(","),
-        projectIds: this.searchForm.glxm.join(","),
+        areaIds: this.searchForm.ssqy,
+        projectIds: this.searchForm.glxm,
         supplierId: this.searchForm.gys,
         applicantId: this.searchForm.sgr,
         orderTimeStart: this.searchForm.xdsj[0],

src/page/purchase/purchaseOrder.vue

@@ -9,7 +9,7 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="4">
-          <Select v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
+          <Select clearable v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
             <Option
               v-for="item in ssqyList"
               :value="item.areaId"
@@ -18,7 +18,7 @@
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
+          <Select clearable v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
             <Option
               v-for="item in glxmList"
               :value="item.projectId"
@@ -53,17 +53,17 @@
           <Input v-model="searchForm.shr" placeholder="收货人" />
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.gys" filterable placeholder="供应商">
+          <Select clearable v-model="searchForm.gys" filterable placeholder="供应商">
             <Option v-for="item in gysList" :value="item.gpId" :key="item.gpId">{{ item.gpName }}</Option>
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.spzt" placeholder="审批状态">
+          <Select clearable v-model="searchForm.spzt" placeholder="审批状态">
             <Option v-for="item in spztList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
         <Col span="4">
-          <Select v-model="searchForm.ddzt" placeholder="订单状态">
+          <Select clearable v-model="searchForm.ddzt" placeholder="订单状态">
             <Option v-for="item in ddztList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>

src/page/purchase/purchasePlan.vue

@@ -9,7 +9,7 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="6">
-          <Select v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
+          <Select clearable v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
             <Option
               v-for="item in ssqyList"
               :value="item.areaId"
@@ -18,7 +18,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
+          <Select clearable v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
             <Option
               v-for="item in glxmList"
               :value="item.projectId"
@@ -27,7 +27,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.jhlx" placeholder="计划类型">
+          <Select clearable v-model="searchForm.jhlx" placeholder="计划类型">
             <Option v-for="item in jhlxList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
@@ -51,7 +51,7 @@
           ></DatePicker>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.fgcgy" placeholder="分管采购员">
+          <Select clearable v-model="searchForm.fgcgy" placeholder="分管采购员">
             <Option
               v-for="item in fgcgyList"
               :value="item.userId"
@@ -60,7 +60,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.spzt" placeholder="审批状态">
+          <Select clearable v-model="searchForm.spzt" placeholder="审批状态">
             <Option v-for="item in spztList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>

src/page/purchase/purchasePool.vue

@@ -4,7 +4,7 @@
       <p slot="title">待采购池</p>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="6">
-          <Select v-model="searchForm.qy" placeholder="区域" @on-change="ssqyChange">
+          <Select clearable v-model="searchForm.qy" placeholder="区域" @on-change="ssqyChange">
             <Option
               v-for="item in ssqyList"
               :value="item.areaId"
@@ -13,7 +13,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.xm" placeholder="项目">
+          <Select clearable v-model="searchForm.xm" placeholder="项目">
             <Option
               v-for="item in ssxmList"
               :value="item.projectId"
@@ -22,12 +22,12 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.yjfl" placeholder="一级分类" @on-change="yjflChange">
+          <Select clearable v-model="searchForm.yjfl" placeholder="一级分类" @on-change="yjflChange">
             <Option v-for="item in yjflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.ejfl" placeholder="二级分类">
+          <Select clearable v-model="searchForm.ejfl" placeholder="二级分类">
             <Option v-for="item in ejflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
@@ -249,7 +249,8 @@ export default {
       this.ejflList = arr;
     },
     addReturn() {
-      this.$router.push("/purchaseOrder");
+      this.contentShow = true;
+      // this.$router.push("/index/purchaseOrder");
     },
     //批量采购
     plcg() {
@@ -260,7 +261,7 @@ export default {
         this.$Message.error("请至少选择一条采购物料信息！");
         return false;
       } else {
-        area = this.tableSelect[0].area;
+        area = this.tableSelect[0].areaId;
         project = this.tableSelect[0].projectId;
       }
       for (let i in this.tableSelect) {
@@ -271,7 +272,7 @@ export default {
           let date = new Date();
           let dateArr = `${date.getFullYear()}-${date.getMonth() +
             1}-${date.getDate()} 00:00:00`;
-          arr.push({
+          toAddArr.push({
             applyDetailId: this.tableSelect[i].id,
             applyRuleId: this.tableSelect[i].purchaseApplyId,
             applyRuleCode: this.tableSelect[i].code,
@@ -312,7 +313,9 @@ export default {
         projectIds: this.searchForm.ssxm,
         storehouseId: this.searchForm.ck
       };
+      this.tableLoading = true;
       queryPurchasePoolList(postData).then(res => {
+        this.tableLoading = false;
         if (res.status == 200) {
           this.tableData = res.data.records;
           this.pageTotal = res.data.total;

src/page/report/historyCost.vue

@@ -13,12 +13,12 @@
           <Input v-model="searchForm.code" placeholder="物料编码" />
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.firstClassId" placeholder="物料一级分类" @on-change="yjflChange">
+          <Select clearable v-model="searchForm.firstClassId" placeholder="物料一级分类" @on-change="yjflChange">
             <Option v-for="item in yjflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.secondClassId" placeholder="物料二级分类">
+          <Select clearable v-model="searchForm.secondClassId" placeholder="物料二级分类">
             <Option v-for="item in ejflList" :value="item.gcId" :key="item.gcId">{{ item.gcName }}</Option>
           </Select>
         </Col>

src/page/report/purchasePlan.vue

@@ -7,7 +7,7 @@
       </div>
       <Row :gutter="10" style="margin-bottom: 10px">
         <Col span="6">
-          <Select multiple v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
+          <Select clearable multiple v-model="searchForm.ssqy" placeholder="所属区域" @on-change="ssqyChange">
             <Option value="all" key="all">全选</Option>
             <Option
               :disabled="searchForm.ssqy.indexOf('all') != -1"
@@ -18,7 +18,7 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select multiple v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
+          <Select clearable multiple v-model="searchForm.glxm" placeholder="关联项目" @on-change="glxmChange">
             <Option value="all" key="all">全选</Option>
             <Option
               :disabled="searchForm.glxm.indexOf('all') != -1"
@@ -29,12 +29,12 @@
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.gysfl" placeholder="供应商分类">
+          <Select clearable v-model="searchForm.gysfl" placeholder="供应商分类">
             <Option v-for="item in gysflList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.sqr" placeholder="申请人">
+          <Select clearable v-model="searchForm.sqr" placeholder="申请人">
             <Option v-for="item in sqrList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>
@@ -59,7 +59,7 @@
           ></DatePicker>
         </Col>
         <Col span="6">
-          <Select v-model="searchForm.spzt" placeholder="审批状态">
+          <Select clearable v-model="searchForm.spzt" placeholder="审批状态">
             <Option v-for="item in spztList" :value="item.value" :key="item.value">{{ item.label }}</Option>
           </Select>
         </Col>

src/service/getData.js

@@ -59,6 +59,8 @@ export const getLabelByCode = (data) => fetch('/dictDetail/getLabelByCode', '/pu
 export const getJobList = (data) => fetch('/common/getJobList', '/purchase', data, 'JSON2', 'GET');
 //通用 --- 供应商  ----  查询供货详情
 export const stockGoodsByGpID = (data) => fetch('/common/stockGoodsByGpID', '/purchase', data, 'JSON2', 'GET');
+//通用 --- 供应商  ----  查询计量单位
+export const getLabelByCode4Purchase = (data) => fetch('/dictDetail/getLabelByCode4Purchase', '/purchase', data, 'JSON2', 'GET');
 /*
  *采购管理
  *供应商模块接口