Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/api/V2/contract/index.js

@@ -1,5 +1,5 @@
 // 根据ID,常量类别获常量数据
-export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectInfo'
+export const API_GET_CONTRACT_TENANT = '/contractManagementInfo/selectInfo'                    
 export const API_POST_ADD_CONTRACT_TENANT = '/contractManagementInfo/api/addInfo'
 export const API_POST_MANNER_OF_PACKING_TENANT = '/commonSysParameter/getInfo'
 // 查看
@@ -15,7 +15,6 @@ export const API_POST_CUSTOM_DOWN_DELETE = '/customDropDown/api/saveDelete'
 // 导出
 export const API_POST_EXPORT = '/contractManagementInfo/export'
 // 操作历史
-export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
-// 修改当前状态
-export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
-
+export const API_POST_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
+// 操作历史
+export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'

src/views/contractManagement/salesContract.vue

@@ -74,23 +74,23 @@
           >查找</ws-button
         >
       </template>
-    </BaseHeaderLayout>
-    <el-table :data="tableData" style="width: 100%; margin-top: 10px">
+    </BaseHeaderLayout> 
+    <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
@@ -149,11 +149,22 @@ export default {
       // 年
       year: '',
       // 提交类型
+      
+    contractType:1,
+        currentPage:1,
+        pageSize:10,
+        searchType:1,
+        searchKeyWord:'',
+        startDate:null,
+        endDate: null,
+
+
       submitType: true,
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
-      tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
+      pickerBeginDateBefore:{},
+      tableData: [],
       taskTypeList: [
         { value: '未完成（默认）' },
         { value: '已完成' },
@@ -178,6 +189,7 @@ export default {
         interviewResult: '1',
         interviewOpinion: '',
         aliasName: '',
+        
       },
       currentPage: 1,
       pageSize: 10,
@@ -194,6 +206,24 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    getList() {
+      getList({
+        
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        contractType:this.contractType,
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        contrPage:this.contrPage,
+      })
+        .toPromise()
+        .then((response) => {
+          this.tableData= response
+        })
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleClose() {
       this.dialogViewSpareMoney = false

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',//目标地址