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

public/static/payprint1.html

@@ -202,12 +202,12 @@
         <div v-if="selectPrint">
             <div v-for="(item,index) in printData1" :key="index">
                 <div class="content">
-                    <div class="part5" v-if="isShowPrintType5">
+                    <!-- <div class="part5" v-if="isShowPrintType5">
                         <div class="header1">
                             付款回执单
                         </div>
                         <img :src="printData1[index].codeUrl" class="paymentScreenshot" />
-                    </div>
+                    </div> -->
                     <div class="center" v-if="isShowPrintType3">
                         <div class="header1">{{ printData1[index].compName}}结算凭证</div>
                         <div class="line"></div>
@@ -343,9 +343,9 @@
                                 <td class="col col-bgc">卸车扣款</td>
                                 <td class="col col-bgc">质量扣款</td>
                                 <td class="col col-bgc">其他扣款</td>
-                                <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                                <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
                                     纯重单价
-                                </td>
+                                </td> -->
                                 <td class="col col-bgc">合计应付</td>
                                 <td class="col col-bgc">购粮性质</td>
                                 <td class="col col-bgc">车牌号</td>
@@ -355,9 +355,9 @@
                                 <td class="col ">{{ printData1[index].unloadDeduction}}</td>
                                 <td class="col ">{{ printData1[index].qualityDeduction}}</td>
                                 <td class="col ">{{ printData1[index].otherDeduction}}</td>
-                                <td class="col " v-if="printData1[index].type == '潮粮'">
+                                <!-- <td class="col " v-if="printData1[index].type == '潮粮'">
                                     {{ printData1[index].solidGrainPrice}}
-                                </td>
+                                </td> -->
                                 <td class="col ">
                                     {{ printData1[index].calculationPayable}}
                                 </td>
@@ -416,9 +416,9 @@
                         <div style="height: 120px;">
 
                             <div class="title">入库检斤单</div>
-                            <div class="leftimg">
+                            <!-- <div class="leftimg">
                                 <img :src="printData1[index].weighingManagement.codeUrl" alt="">
-                            </div>
+                            </div> -->
                             <div class="number1">{{printData1[index].weighingManagement.number}}</div>
                         </div>
 
@@ -545,8 +545,11 @@
                                 {{printData1[index].bankDeposit}}{{printData1[index].bankCard}}
                             </div>
                             <!-- <img :src="customerList1[index].imgURl.imageUrl3" class="avatar" /> -->
-                            <img :src="printData1[index].imgURl.imageUrl3" class="avatar" />
-                            <img :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl3" class="avatar" />
+                            <img v-else  class="avatar" />
+                            <img v-if="printData1[index].imgURl" :src="printData1[index].imgURl.imageUrl4" class="avatar" />
+                            <img v-else  class="avatar" />
+
                         </div>
                         <!--          <div class="sfcard-content part2">
                 <div class="sfcard-title">
@@ -559,12 +562,12 @@
             </div>
         </div>
         <div class="content" v-else>
-            <div class="part5" v-if="isShowPrintType5">
+            <!-- <div class="part5" v-if="isShowPrintType5">
                 <div class="header1">
                     付款回执单
                 </div>
                 <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
-            </div>
+            </div> -->
             <div class="center part1" v-if="isShowPrintType3" :class="!selectPrint? 'simple':''">
                 <div class="header1">{{ printData.compName}}结算凭证</div>
                 <div class="line"></div>
@@ -625,7 +628,8 @@
                         <td class="col col-bgc">皮重</td>
                         <td class="col col-bgc">扣杂重</td>
                         <td class="col col-bgc">净重</td>
-                        <td class="col col-bgc">出库净重</td>
+                        <td class="col col-bgc"></td>
+                        <!-- <td class="col col-bgc">出库净重</td> -->
                         <!-- <td class="col col-bgc">纯重</td> -->
                     </tr>
                     <tr class="row">
@@ -646,7 +650,7 @@
                             {{ printData.weighingManagement.buckleMiscellaneous}}
                         </td>
                         <td class="col">{{ printData.netWeight}}</td>
-                        <td class="col">{{printData.contractManagement ? printData.contractManagement.weight : "0"}}</td>
+                        <td class="col"></td>
                         <!-- <td class="col">{{ printData.pureWeight}}</td> -->
                     </tr>
                     <tr class="row">
@@ -687,9 +691,9 @@
                         <td class="col col-bgc">卸车扣款</td>
                         <td class="col col-bgc">质量扣款</td>
                         <td class="col col-bgc">其他扣款</td>
-                        <td class="col col-bgc" v-if="printData.type == '潮粮'">
+                        <!-- <td class="col col-bgc" v-if="printData.type == '潮粮'">
                             纯重单价
-                        </td>
+                        </td> -->
                         <td class="col col-bgc">合计应付</td>
                         <td class="col col-bgc">购粮性质</td>
                         <td class="col col-bgc">车牌号</td>
@@ -699,9 +703,9 @@
                         <td class="col ">{{ printData.unloadDeduction}}</td>
                         <td class="col ">{{ printData.qualityDeduction}}</td>
                         <td class="col ">{{ printData.otherDeduction}}</td>
-                        <td class="col " v-if="printData.type == '潮粮'">
+                        <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
-                        </td>
+                        </td> -->
                         <td class="col ">{{ printData.calculationPayable}}</td>
                         <td class="col ">
                             {{ printData.qualityInspectionManagement.natureOfGrainPurchase}}
@@ -750,9 +754,9 @@
                 <div>
 
                     <div class="title">入库检斤单</div>
-                    <div class="leftimg">
+                    <!-- <div class="leftimg">
                         <img :src="tableData.codeUrl" alt="">
-                    </div>
+                    </div> -->
                     <div class="number1">{{tableData.number}}</div>
                 </div>
                 <table class="table">

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/houseSelfCollect/inspectionManagementNew.vue

@@ -968,15 +968,16 @@ export default {
     },
     customerChange(e) {
       let customers = e.split('(')
+      this.deptBudgetList.bankCard = customers[1].split(')')[0]
       this.deptBudgetList.customerName = customers[0]
+      
       for (let i = 0; i < this.customerList1.length; i++) {
-        // console.log(this.customerList1[i].customerName, this.customerList1[i])
-        if (this.customerList1[i].customerName == this.deptBudgetList.customerName) {
+        if (this.customerList1[i].customerName == this.deptBudgetList.customerName && this.customerList1[i].bankCard == this.deptBudgetList.bankCard) {
           // console.log(this.customerList1[i])
           this.deptBudgetList.customerNumberCard = this.customerList1[i].customerNumberCard
+          this.deptBudgetList.customerPhone = this.customerList1[i].customerPhone
         }
       }
-      this.deptBudgetList.customerPhone = customers[1].split(')')[0]
     },
     waterContentChange(type) {
           //客户
@@ -992,10 +993,10 @@ export default {
               let customer = response
               for (let i = 0; i < response.length; i++) {
                 if (response[i].supplier) {
-                  customer = response[i].customerName + '(' + response[i].customerPhone + ')' + '-' + response[i]
+                  customer = response[i].customerName + '(' + response[i].bankCard + ')' + '-' + response[i]
                     .supplier
                 } else {
-                  customer = response[i].customerName + '(' + response[i].customerPhone + ')'
+                  customer = response[i].customerName + '(' + response[i].bankCard + ')'
                 }
                 this.customerList.push({
                   valueKey: i,

src/views/houseSelfCollect/paymentManagement.vue

@@ -1233,18 +1233,18 @@
         let _list2 = []
         if (this.printType == 1) {
           localStorage.setItem('cwprint', true)
-          if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
-            // 财务批量打印数据
-            for (let i = 0; i < this.selectPrintList.length; i++) {
-              if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
-                this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
-                this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
-              } else {
-                this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
-                this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
-              }
-            }
-          }
+          // if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
+          //   // 财务批量打印数据
+          //   for (let i = 0; i < this.selectPrintList.length; i++) {
+          //     if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
+          //       this.selectPrintList[i].compName = '黑龙江鑫满仓粮食贸易有限公司'
+          //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1CCQ0H5R'
+          //     } else {
+          //       this.selectPrintList[i].compName = '黑龙江利润元粮食贸易有限公司'
+          //       this.selectPrintList[i].taxRegistrationNo = '91230230MA1C08CC6B'
+          //     }
+          //   }
+          // }
           
           localStorage.setItem(
             'selectPrint_selectPrintList',

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) {