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

src/lang/zh.js

@@ -583,8 +583,8 @@
     platformaudit: '平台审核',
     grainmerchantreview: '粮商审核',
     driverreview: '司机审核',
-    transactioninformationreview: '采购交易信息审核',
-    saletransactioninformationreview: '销售交易信息审核',
+    transactioninformationreview: '采购信息审核',
+    saletransactioninformationreview: '销售信息审核',
 
     // 采购模块
     procurement: '采购管理',

src/views/contractManagement/purchaseContract.vue

@@ -374,7 +374,6 @@ export default {
       startDate: null,
       endDate: null,
       addressUrls: [],
-      accessurl: '',
       accesscard: false,
       // 提交类型
       submitType: true,
@@ -520,8 +519,6 @@ export default {
               response.records[i].addressUrlArray = []
             }
           }
-          console.log( response.records[2].addressUrl == null)
-          console.log( response.records[2].addressUrl == "")
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total

src/views/customer/customerList.vue

@@ -292,7 +292,7 @@ export default {
       submitType: true,
       size: 10,
       spanArr: [],
-      depositRatio: '',
+      depositRatio: '700',
       id: '',
       money: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -603,6 +603,7 @@ export default {
           this.outerVisibleReturn = false
           this.outerVisibleEdit = false
           this.getList()
+          this.money = ''
 
           //增加定金
           if (asdf == 1) {

src/views/financialManagement/collectionManagementList.vue

@@ -496,8 +496,10 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        contractNo: this.contractNo,
-        pcFlag: this.pcFlag
+        // contractNo: this.contractNo,
+        pcFlag: this.pcFlag,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord
       })
         .toPromise()
         .then(response => {

src/views/salesManagement/salesPlanOrderList.vue

@@ -726,8 +726,8 @@
         <el-table-column prop="transactionPrice" label="平仓价">
         </el-table-column>
         <el-table-column prop="basis" label="基差"> </el-table-column>
-        <el-table-column prop="turnover" label="成交量"> </el-table-column>
-        <el-table-column prop="dealDate" label="成交日期"> </el-table-column>
+        <el-table-column prop="turnover" label="平仓量"> </el-table-column>
+        <el-table-column prop="dealDate" label="平仓日期"> </el-table-column>
       </el-table>
     </el-dialog>
     <!--改价记录-->