Browse Source

前端mxx

gjy 4 years ago
parent
commit
246ac113e1

+ 27 - 23
src/views/contractManagement/salesContract.vue

@@ -80,22 +80,22 @@
         >
       </template>
     </BaseHeaderLayout> 
-    <el-table :data="tableData" style="width: 100%; margin-top: 10px">
+    <el-table :data="tableData.records" style="width: 100%; margin-top: 10px">
       <el-table-column type="index" />
-      <el-table-column prop="date" label="合同编号" width="80">
+      <el-table-column prop="contractNo" label="合同编号" width="80">
       </el-table-column>
-      <el-table-column prop="name" label="货名" width="80"> </el-table-column>
-      <el-table-column prop="address" label="品级"> </el-table-column>
-      <el-table-column prop="address" label="重量(吨)"> </el-table-column>
-      <el-table-column prop="address" label="合同单价(元)"> </el-table-column>
-      <el-table-column prop="address" label="包装方式"> </el-table-column>
-      <el-table-column prop="address" label="买方"> </el-table-column>
-      <el-table-column prop="address" label="卖方"> </el-table-column>
-      <el-table-column prop="address" label="已完成(吨)"> </el-table-column>
-      <el-table-column prop="address" label="状态"> </el-table-column>
-      <el-table-column prop="address" label="签订日期"> </el-table-column>
-      <el-table-column prop="address" label="未回款(元)"> </el-table-column>
-      <el-table-column prop="address" label="附件"> </el-table-column>
+      <el-table-column prop="goodsName" label="货名" width="80"> </el-table-column>
+      <el-table-column prop="grade" label="品级"> </el-table-column>
+      <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
+      <el-table-column prop="unitContractPrice" label="合同单价(元)"> </el-table-column>
+      <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
+      <el-table-column prop="buyer" label="买方"> </el-table-column>
+      <el-table-column prop="seller" label="卖方"> </el-table-column>
+      <el-table-column prop="imperfectGrain" label="已完成(吨)"> </el-table-column>
+      <el-table-column prop="status" label="状态"> </el-table-column>
+      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column prop="mildewGrain" label="未回款(元)"> </el-table-column>
+      <el-table-column prop="addressUrl" label="附件"> </el-table-column>
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
           <el-button
@@ -150,12 +150,22 @@ export default {
       // 年
       year: '',
       // 提交类型
+      
+    contractType:1,
+        currentPage:1,
+        pageSize:10,
+        searchType:1,
+        searchKeyWord:'',
+        startDate:null,
+        endDate: null,
+
+
       submitType: true,
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
       pickerBeginDateBefore:{},
-      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      tableData: [],
       taskTypeList: [
         { value: '未完成(默认)' },
         { value: '已完成' },
@@ -180,13 +190,7 @@ export default {
         interviewResult: '1',
         interviewOpinion: '',
         aliasName: '',
-        contractType:1,
-        currentPage:1,
-        pageSize:10,
-        searchType:1,
-        searchKeyWord:'',
-        startDate:null,
-        endDate: null,
+        
       },
     }
   },
@@ -212,7 +216,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.contractList = response
+          this.tableData= response
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件

File diff suppressed because it is too large
+ 285 - 683
src/views/contractManagement/salesContractExamine.vue


+ 1 - 1
vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.124:8090/',
+        target: 'http://192.168.1.110:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址

Some files were not shown because too many files changed in this diff