项目修改

src/views/project/index1.vue

@@ -15,7 +15,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="客户名称" prop="fCorpid">
-              <el-select size="small" style="width:200px" v-model="form.fCorpid">
+              <el-select size="small" style="width:200px" v-model="form.fCorpid" clearable>
                 <el-option
                 v-for="item in fMblnoOptions"
                 :key="item.fId"
@@ -26,7 +26,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="责任人" prop="fPerson">
-              <el-select size="small" style="width:200px" v-model="form.fPerson">
+              <el-select size="small" style="width:200px" v-model="form.fPerson" clearable>
                 <el-option
                 v-for="item in liableOption"
                 :key="item.userId"
@@ -286,7 +286,13 @@
           </template>
         </el-table-column>
       </el-table>
-
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="form.pageNum"
+        :limit.sync="form.pageSize"
+        @pagination="getList"
+      />
     </div>
     <div v-if="mainTabel == true">
       <el-form label-width="88px" ref="detailform" :model="detailform" :rules="rules">
@@ -605,6 +611,8 @@ export default {
   },
   data() {
     return {
+      // 总条数
+      total: 0,
       operator:'',
       lander:'',
       before:'',
@@ -616,7 +624,10 @@ export default {
       doNotchange:false,
       doNot:false,
       materialOption:[],
-      form:{},
+      form:{
+        pageNum: 1,
+        pageSize: 10,
+      },
       detailform:{},
       show: false,
       single:true,
@@ -727,7 +738,7 @@ export default {
         },
         {
           surface: "2",
-          label: "fCurrency",
+          label: "fCurrencyName",
           name: "规格",
           checked: 0,
           width: 100,
@@ -879,7 +890,7 @@ export default {
         for(let li in this.materialOption){
           if(this.detailList[item].fMaterial == this.materialOption[li].fId){
             this.$set(this.detailList[item],'fMeasure',JSON.stringify(this.materialOption[li].fFeeunitid))
-            this.$set(this.detailList[item],'fCurrency',this.materialOption[li].fCurrency)
+            this.$set(this.detailList[item],'fCurrencyName',this.materialOption[li].fCurrency)
           }
         }
       }
@@ -981,13 +992,14 @@ export default {
     //刷新
     getList() {
       this.loading = false
-      listCharge(this.projectList).then(response => {
+      listCharge(this.form).then(response => {
         if (response.rows) {
           this.projectList = response.rows
-          for (let li in this.projectList) {
-            this.name = this.projectList[li]
-          }
+          // for (let li in this.projectList) {
+          //   this.name = this.projectList[li]
+          // }
         }
+        this.total = response.total;
       })
     },
     handleAdd() {
@@ -1035,10 +1047,19 @@ export default {
 
     },
     handleQuery() {
-
+      this.getList();
     },
     resetQuery() {
-
+      this.form = {
+        fNumber:null,
+        fName:null,
+        fCorpid:null,
+        fPerson:null,
+        fTel:null,
+        fAddress:null,
+        remark:null,
+      }
+      this.getList()
     },
     addList() {
       this.detailList.push({

src/views/purchaseIssue/index.vue

@@ -717,7 +717,8 @@ export default {
           this.listData.fFeeid.push({
             label: res.rows[item].fName,
             value: res.rows[item].fId,
-            fFeeunitid: res.rows[item].fFeeunitid
+            fFeeunitid: res.rows[item].fFeeunitid,
+            fCurrency: res.rows[item].fCurrency
           })
         }
       }
@@ -775,6 +776,7 @@ export default {
         for (let li in this.listData.fFeeid) {
           if (this.contentList[item].fFeeid == this.listData.fFeeid[li].value) {
             this.$set(this.contentList[item], 'fFeeunitid', this.listData.fFeeid[li].fFeeunitid)
+            this.$set(this.contentList[item], 'fCurrencyName', this.listData.fFeeid[li].fFeeunitid)
           }
         }
       }

src/views/purchaseRequest/index.vue

@@ -315,7 +315,7 @@ export default {
           changeable: 1
         }, {
           surface: '3',
-          label: 'fCurrency',
+          label: 'fCurrencyName',
           name: '规格',
           checked: 0,
           width: 100,
@@ -786,7 +786,7 @@ export default {
           if(this.contentList[item].fFeeid == this.listData.fFeeid[li].value){
             console.log("111")
             this.$set(this.contentList[item],'fFeeunitid',this.listData.fFeeid[li].fFeeunitid)
-            this.$set(this.contentList[item],'fCurrency',this.listData.fFeeid[li].fCurrency)
+            this.$set(this.contentList[item],'fCurrencyName',this.listData.fFeeid[li].fCurrency)
           }
         }
       }

src/views/warehouse/inStock/index.vue

@@ -405,7 +405,7 @@ export default {
         },
         {
           surface: "3",
-          label: "fCurrency",
+          label: "fCurrencyName",
           name: "规格",
           checked: 0,
           width: 200,
@@ -809,7 +809,7 @@ export default {
         for(let li in this.listData.fFeeid){
           if(this.detailData[item].fFeeid == this.listData.fFeeid[li].value){
             this.$set(this.detailData[item],'fFeeunitid',JSON.stringify(this.listData.fFeeid[li].fFeeunitid))
-            this.$set(this.detailData[item],'fCurrency',this.listData.fFeeid[li].fCurrency)
+            this.$set(this.detailData[item],'fCurrencyName',this.listData.fFeeid[li].fCurrency)
             console.log(this.detailData)
           }
         }

src/views/warehouse/outStock/index.vue

@@ -396,7 +396,7 @@ export default {
           onabort:''
         },{
           surface: "2",
-          label: "fFeeid",
+          label: "fCurrencyName",
           name: "品名",
           checked: 0,
           width: 200,
@@ -405,7 +405,7 @@ export default {
         },
         {
           surface: "3",
-          label: "fCurrency",
+          label: "fCurrencyName",
           name: "规格",
           checked: 0,
           width: 100,
@@ -809,7 +809,7 @@ export default {
         for(let li in this.listData.fFeeid){
           if(this.detailData[item].fFeeid == this.listData.fFeeid[li].value){
             this.$set(this.detailData[item],'fFeeunitid',JSON.stringify(this.listData.fFeeid[li].fFeeunitid))
-            this.$set(this.detailData[item],'fCurrency',this.listData.fFeeid[li].fCurrency)
+            this.$set(this.detailData[item],'fCurrencyName',this.listData.fFeeid[li].fCurrency)
           }
         }
       }