Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContractAdd.vue

@@ -89,11 +89,12 @@
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营方电话" span="1" prop="sellerPhone">
           <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
-          <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
+          <!-- <el-select filterable  v-model="deptBudgetList.jointVentureParties" placeholder="请选择合营方名称" class="typeselect" 
             @change="jointSelect" filterable clearable>
             <el-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
               :value="item.customerName" />
-          </el-select>
+          </el-select> -->
+          <ws-input v-model="deptBudgetList.jointPhone" maxlength="100" size="small" placeholder="请输入合营方电话" />
         </ws-form-item>
         <ws-form-item v-if="deptBudgetList.transactionSubject == '合营'" label="合营加价" span="1" prop="seller" class="readonly">
           <ws-input v-model="deptBudgetList.jointVentureMarkup" placeholder="请输入合营加价" maxlength="3"

src/views/statisticalReport/autoSettlementList.vue

@@ -44,7 +44,8 @@
       <el-row>
         <div style="color:red">注：审核时，同一运输阶段勾选任意复选框，当前运输阶段下所有条目都通过审核！</div>
       </el-row>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"   @row-click="handleRowClick"
+      <el-table :summary-method="countTotal"
+    show-summary class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" ref="warehouseList"   @row-click="handleRowClick"
         @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
@@ -565,6 +566,32 @@ export default {
     warehouseNameChange(){
       this.getList()
     },
+    countTotal(param) {
+      console.log(param)
+      const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += ' 元';
+          } else {
+            sums[index] = 'N/A';
+          }
+        });
+        return sums;
+    },
     onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -1263,6 +1290,9 @@ export default {
       }
     },
     handleSelectionChange(val) {
+      if (val.length !== 0) {
+        this.totalNumer = this.countTotal(val, 'shipped')
+      }
       this.modification = val
     },
     handlestatus(status) {