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

public/static/payprint.html

@@ -584,7 +584,7 @@
         </div>
         <div class="small-row">
           <div>开票日期</div>
-          <div>{{date}}</div>
+          <div>{{printData.createDate}}</div>
         </div>
         <div class="small-row">
           <div>买方单位名称</div>

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -181,7 +181,7 @@
 
       </ws-info-table>
 
-      <div class="wenzi">
+      <div>
         <h3>货物信息</h3>
       </div>
       <!--货物信息-->
@@ -253,10 +253,9 @@
             @change="handleChange1" style="width:200%" /> -->
           <el-button @click="mapInputClick('source')" class="address-btn">{{ newSelectedOptions }} </el-button>
         </ws-form-item>
-
       </ws-info-table>
 
-      <div class="wenzi">
+      <div>
         <h3>流程信息</h3>
       </div>
       <!--流程信息-->
@@ -299,7 +298,7 @@
         </ws-form-item>
       </ws-info-table>
 
-      <div class="wenzi">
+      <div>
         <h3>备注信息</h3>
       </div>
       <!--备注信息-->

src/views/contractManagement/salesContractExamine.vue

@@ -640,7 +640,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
+  width: 70%;
   margin: 0 auto;
 }
 .el-form-item {

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -6,7 +6,7 @@
        <!-- <div>税务登记编号：91230230MA1BNL7Q93</div> -->
     </div>
     <div class="header-top">
-      <div>单位：公斤、元</div>
+      <div>单位：公斤/元</div>
       <div>No.</div>
     </div>
     <div class="header-top">

src/views/houseSelfCollect/paymentManagement.vue

@@ -186,8 +186,6 @@
     <!--客户信息-->
     <el-dialog width="50%" title="客户信息" :visible.sync="customerInfo" :append-to-body="true" :close="customerclose">
       <el-form class="customer">
-
-
         <div class="flex">
           <div style="flex: 1; text-align: center">
             <h4>身份证正面</h4>
@@ -508,7 +506,6 @@ import download from '../../components/WsDownload/download'
           this.customerlist.cardAddressUrl2 = this.customerlist.cardAddressUrl.split(',')[1]
           this.customerlist.payeeAddressUrls = this.customerlist.payeeAddressUrl.split(',')
         })
-        
       },
       customerclose(e) {
         console.log(e)

src/views/statisticalReport/huoyunList.vue

@@ -206,7 +206,7 @@
       <el-form :model="form">
         <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
           <template>
-            <span>{{ amountNotPayable }}</span>
+            <span>{{ alreadyInvoice }}</span>
           </template>
         </el-form-item>
         <el-form-item label="本次付款金额" :label-width="formLabelWidth">
@@ -433,8 +433,6 @@ export default {
       dialogFormVisible7: false,
       dialogFormVisible8: false,
       dialogFormVisible11: false,
-      dialogVisible: false,
-
       form: {
         transactionPrice: '',
         transactionsNumber: '',
@@ -631,14 +629,12 @@ export default {
           } else {
             this.driverPayeeList[i].radio = '2'
           }
-          console.log(this.driverPayeeList[i].radio)
         }
         this.id = item.id
       }
     },
     //结算
     handlepayment() {
-      // this.dialogFormVisible1 = true
       this.amountNotPayable = 0
       this.money = this.money
       this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
@@ -647,16 +643,16 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
-        for (var i = 0; i < this.modification.length; i++) {
-          if (
-            this.modification[i].status != '已通过' &&
-            this.modification[i].status != '部分付款'
-          ) {
-            this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
-            return
-          }
-          this.amountNotPayable += this.modification[i].amountNotPayable
-        }
+        //for (var i = 0; i < this.modification.length; i++) {
+        //   if (
+        //     this.modification[i].status != '已通过' &&
+        //     this.modification[i].status != '部分付款'
+        //   ) {
+        //     this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
+        //     return
+        //   }
+        //   this.amountNotPayable += this.modification[i].amountNotPayable
+        // }
         this.dialogFormVisible1 = true
       }
     },
@@ -681,7 +677,7 @@ export default {
           this.money < 0 ||
           (String(this.money).indexOf('.') != -1 &&
             String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
+              2) || this.money > 100000000
         ) {
           this.$message({
             message: '付款金额输入错误',
@@ -705,7 +701,7 @@ export default {
           })
           return
         }
-        if (this.money > this.modification[0].amountNotPayable) {
+        if (Number(this.money) > Number(this.alreadyInvoice)) {
           this.$message({
             message: '付款金额不能大于未付金额！',
             type: 'warning',
@@ -739,7 +735,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -809,7 +804,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -849,7 +843,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -1166,11 +1159,16 @@ export default {
               response.records[i].amountIngPayable -
               response.records[i].amountEdPayable
               if(this.processNo){
-                this.amountEdPayable += response.records[i].amountEdPayable // 已付
-                 this.alreadyInvoice += response.records[i].alreadyInvoice//未付
-                this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
+                // this.amountEdPayable += response.records[i].amountEdPayable // 已付
+                //  this.alreadyInvoice += response.records[i].alreadyInvoice//未付
+                 if(response.records[0].paymentScreenshot){
+                    this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
+                  this.paymentScreenshot = response.records[0].paymentScreenshot
+                }
               } 
           }
+            this.amountEdPayable = response.records[0].amountEdPayable // 已付
+             this.alreadyInvoice = response.records[0].amountNotPayable//未付
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
@@ -1194,18 +1192,11 @@ export default {
       console.log(file)
     },
     handlePictureCardPreview(file) {
-      console.log("dmlskgldjg",file)
-      this.paymentScreenshot = file.url
-      for(let i = 0 ; i < this.modification.length ; i++){//选中的条数每条都添加一张付款截图
-        if(this.modification[i].paymentScreenshot){
-           this.modification[i].paymentScreenshot = ","+file.url
+        if(this.paymentScreenshot){
+          this.paymentScreenshot += "," + file.url
         }else{
-           this.modification[i].paymentScreenshot = file.url
+            this.paymentScreenshot =  file.url
         }
-      }
-     
-
-      this.dialogVisible = true
     },
     handleDownload(file) {
       console.log(file)

src/views/statisticalReport/shippingList.vue

@@ -28,37 +28,39 @@
             type="primary"
             v-hasPermission="`report.transportationReport.view`"
             @click="handlepass()"
+            v-if="processNo"
             >通过</ws-button
           >
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.view`"
             @click="handlereject()"
+            v-if="processNo"
             >驳回</ws-button
           >
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.payment`"
             @click="handlepayment"
+            v-if="processNo"
             >付款</ws-button
           >
-          <ws-button
+          <!-- <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.draw`"
             @click="handleninvoice"
             >开发票</ws-button
-          >
+          > -->
         </el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="14"
         >
-         <el-select
+          <el-select
             v-model="contractNo"
             placeholder="请选择合同"
             clearable
             filterable
-           
             @change="contractchange"
             maxlength="500"
             type="input"
@@ -76,7 +78,6 @@
             placeholder="请选择运输任务编号"
             clearable
             filterable
-            
             @change="taskNochange"
             maxlength="500"
             type="input"
@@ -85,7 +86,7 @@
             <el-option
               v-for="item in taskNoList"
               :key="item.taskNoKey"
-              :label="item.taskNoValue "
+              :label="item.taskNoValue"
               :value="item.taskNoValue"
             />
           </el-select>
@@ -94,7 +95,6 @@
             placeholder="请选择运输阶段编号"
             clearable
             filterable
-           
             @change="processNochange"
             maxlength="500"
             type="input"
@@ -103,60 +103,84 @@
             <el-option
               v-for="item in processNoList"
               :key="item.processNoKey"
-              :label="item.processNoValue "
+              :label="item.processNoValue"
               :value="item.processNoValue"
             />
           </el-select>
         </el-col>
       </el-row>
-      <!-- v-if="actualFreight && tranPriceIng" -->
-       <div class="freightSet" v-if="processNo">
-        <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
-        <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight ? actualFreight : tranPriceIng}}</span>元</span>
-        <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
+      <div class="freightSet" v-if="processNo">
+        <div style="display: flex; width: 200px; line-height: 30px">
+          预计运费（元）：{{ tranPriceIng }}元
+        </div>
+        <span style="display: flex; line-height: 30px"
+          >实际运费（元）：<el-input
+            type="text"
+            maxlength="70"
+            size="small"
+            v-model="actualFreight"
+            v-show="textShow"
+          /><span v-show="!textShow">{{
+            actualFreight ? actualFreight : tranPriceIng
+          }}</span
+          >元</span
+        >
+        <i
+          @click="actualFreightchange"
+          class="iconfont icon-dui"
+          v-show="textShow"
+          style="margin-top: 10px"
+        ></i>
         <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: 6px"
-              src="../../../public/img/edit.png"
-              @click="textShow = true"
-              alt=""
-               v-show="!textShow"
-            />
-            <span class="span_text">已付：{{amountEdPayable}}元
-                <img
+          width="17"
+          height="18"
+          style="vertical-align: text-top; position: relative; top: 6px"
+          src="../../../public/img/edit.png"
+          @click="textShow = true"
+          alt=""
+          v-show="!textShow"
+        />
+        <span class="span_text"
+          >已付：{{ amountEdPayable }}元
+          <img
             width="18"
             height="20"
             style="vertical-align: text-top; position: relative; top: -1px"
             src="../../../public/img/fujian.png"
             @click="fujian()"
             alt=""
-          />{{paymentScreenshotList.length == 0 ? "暂无附件" : paymentScreenshotList.length}}</span>
-            <span class="span_text">未付：{{alreadyInvoice}}元</span>
-            <span class="span_text">{{priceStatus}}</span>
+          />{{
+            paymentScreenshotList.length == 0
+              ? '暂无附件'
+              : paymentScreenshotList.length
+          }}</span
+        >
+        <span class="span_text">未付：{{ alreadyInvoice }}元</span>
+
+        <span class="span_text">{{ priceStatus }}</span>
       </div>
 
       <el-table
         class="wenzi"
         :data="warehouseList.records"
         style="width: 100%; margin-top: 20px"
-        ref="warehouseList"
+        ref="warehouseList.records"
         border
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column
+        <!-- <el-table-column
           :selectable="selectInit"
           type="selection"
           width="55"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column
           class="table_td"
           prop="contractNo"
           label="合同编号"
         ></el-table-column>
-         <el-table-column
+        <el-table-column
           class="table_td"
           prop="taskNo"
           label="运输任务"
@@ -180,21 +204,15 @@
           class="table_td"
           prop="loadingWeight"
           label="装车净重（吨）"
-          ></el-table-column
-        >
+        ></el-table-column>
         <el-table-column
           class="table_td"
           prop="unloadingWeight"
           label="卸车净重(吨)"
         >
         </el-table-column>
-        <el-table-column
-          class="table_td"
-          prop="lossWeight"
-          label="损耗(吨)"
-        >
+        <el-table-column class="table_td" prop="lossWeight" label="损耗(吨)">
         </el-table-column>
-    
       </el-table>
 
       <!-- 页数 -->
@@ -217,7 +235,7 @@
       <el-form :model="form">
         <el-form-item label="未付金额（元）" :label-width="formLabelWidth">
           <template>
-            <span>{{ amountNotPayable }}</span>
+            <span>{{ alreadyInvoice }}</span>
           </template>
         </el-form-item>
         <el-form-item label="本次付款金额" :label-width="formLabelWidth">
@@ -311,47 +329,47 @@
     >
       <h3 style="margin-left: 30px">{{ driverPayeeList.payeeName }}的账户</h3>
       <div v-for="(item, index) in driverPayeeList" :key="index">
-      <h4 style="margin-left: 30px">账户-{{index+1}}</h4>
-      <div class="anniu">
-        <el-radio-group @change="bankCard(item,id)" v-model="item.radio">
-        <el-radio label="1">本次收款账户</el-radio>
-      </el-radio-group>
-      </div>
-      <el-form class="customer" :model="form">
-        <el-form-item label="账户类型" :label-width="formLabelWidth">
-          {{ item.accountType }}
-        </el-form-item>
-        <el-form-item label="银行卡号" :label-width="formLabelWidth">
-          {{ item.bankCard }}
-        </el-form-item>
-        <el-form-item label="开户行" :label-width="formLabelWidth">
-          {{ item.bankDeposit }}
-        </el-form-item>
-        <el-form-item label="开户支行" :label-width="formLabelWidth">
-          {{ item.bankDepositBranch }}
-        </el-form-item>
-        <el-form-item
-          label="收款人姓名"
-          :label-width="formLabelWidth"
-          v-if="item.accountTypeFlag == 1"
-        >
-          {{ item.payeeName }}
-        </el-form-item>
-        <el-form-item
-          label="收款人身份证号"
-          :label-width="formLabelWidth"
-          v-if="item.accountTypeFlag == 1"
-        >
-          {{ item.payeeNumberCard }}
-        </el-form-item>
-        <el-form-item
-          v-if="item.accountTypeFlag == 2"
-          label="企业名称"
-          :label-width="formLabelWidth"
-        >
-          {{ item.compName }}
-        </el-form-item>
-      </el-form>
+        <h4 style="margin-left: 30px">账户-{{ index + 1 }}</h4>
+        <div class="anniu">
+          <el-radio-group @change="bankCard(item, id)" v-model="item.radio">
+            <el-radio label="1">本次收款账户</el-radio>
+          </el-radio-group>
+        </div>
+        <el-form class="customer" :model="form">
+          <el-form-item label="账户类型" :label-width="formLabelWidth">
+            {{ item.accountType }}
+          </el-form-item>
+          <el-form-item label="银行卡号" :label-width="formLabelWidth">
+            {{ item.bankCard }}
+          </el-form-item>
+          <el-form-item label="开户行" :label-width="formLabelWidth">
+            {{ item.bankDeposit }}
+          </el-form-item>
+          <el-form-item label="开户支行" :label-width="formLabelWidth">
+            {{ item.bankDepositBranch }}
+          </el-form-item>
+          <el-form-item
+            label="收款人姓名"
+            :label-width="formLabelWidth"
+            v-if="item.accountTypeFlag == 1"
+          >
+            {{ item.payeeName }}
+          </el-form-item>
+          <el-form-item
+            label="收款人身份证号"
+            :label-width="formLabelWidth"
+            v-if="item.accountTypeFlag == 1"
+          >
+            {{ item.payeeNumberCard }}
+          </el-form-item>
+          <el-form-item
+            v-if="item.accountTypeFlag == 2"
+            label="企业名称"
+            :label-width="formLabelWidth"
+          >
+            {{ item.compName }}
+          </el-form-item>
+        </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible8 = false">取 消</el-button>
@@ -386,14 +404,17 @@
       </div>
     </WinseaContentModal>
 
-     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="accessoryTFs = false">
-      <div v-for="(item,index) in paymentScreenshotList" :key="index">
-			<!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="accessoryTFs = false"
+    >
+      <div v-for="(item, index) in paymentScreenshotList" :key="index">
+        <!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
 				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
-        <img :src="item" alt="附件" class="img_css">
-        </div>
-		</WinseaContentModal>
+        <img :src="item" alt="附件" class="img_css" />
+      </div>
+    </WinseaContentModal>
   </div>
   <!-- </div> -->
 </template>
@@ -406,7 +427,7 @@ import {
   openinvoicelist,
   getYunShuXiaLa,
   getYunShuNumber,
-  SetYunShuPrice
+  SetYunShuPrice,
 } from '@/model/statisticalReport/index'
 import { posthandle } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -469,7 +490,7 @@ export default {
       // 年
       year: '',
       options: [],
-      id:'',
+      id: '',
       pickerOptions: {},
       value2: '',
       deptBudgetTotal: 0,
@@ -480,7 +501,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       driverPayeeList: {
-          radio: '1',
+        radio: '1',
       },
       contractType: 2,
       accessoryTFs: false,
@@ -489,14 +510,14 @@ export default {
       enter: {
         closePositionList: [],
       },
-       taskNoList:[],
-        processNoList:[],
-        taskNo:"",
-         processNo:"",
-         textShow:false,
-         actualFreight:"",
-         processNoId:"",
-      tranPriceIng:"",
+      taskNoList: [],
+      processNoList: [],
+      taskNo: '',
+      processNo: '',
+      textShow: false,
+      actualFreight: '',
+      processNoId: '',
+      tranPriceIng: '',
 
       // 提交类型
       submitType: true,
@@ -544,10 +565,10 @@ export default {
           return time.getTime() > Date.now()
         },
       },
-       amountEdPayable : "",//已付金额
-      alreadyInvoice:"",//未付金额
-      priceStatus:"",//状态
-      paymentScreenshotList:[],//付款截图
+      amountEdPayable: '', //已付金额
+      alreadyInvoice: '', //未付金额
+      priceStatus: '', //状态
+      paymentScreenshotList: [], //付款截图
     }
   },
   activated() {
@@ -555,6 +576,17 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    fujian() {
+      if (this.paymentScreenshotList.length == 0) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      // this.appendixIdss = row.addressUrl
+    },
     cur(status) {
       if (status == 0) {
         this.currect = true
@@ -620,34 +652,34 @@ export default {
     look(item) {
       this.dialogFormVisible8 = true
       if (item.driverPayeeInfoList) {
-        this.driverPayeeList= item.driverPayeeInfoList
-        this.driverPayeeList.payeeName=item.driverPayeeInfoList[0].payeeName
-        for (var i = 0; i < item.driverPayeeInfoList.length; i++){
-          if(item.driverPayeeInfoList[i].bankCard==item.cardNo){
-            this.driverPayeeList[i].radio='1'
-          }
-          else{
-            this.driverPayeeList[i].radio='2'
+        this.driverPayeeList = item.driverPayeeInfoList
+        this.driverPayeeList.payeeName = item.driverPayeeInfoList[0].payeeName
+        for (var i = 0; i < item.driverPayeeInfoList.length; i++) {
+          if (item.driverPayeeInfoList[i].bankCard == item.cardNo) {
+            this.driverPayeeList[i].radio = '1'
+          } else {
+            this.driverPayeeList[i].radio = '2'
           }
-          console.log(this.driverPayeeList[i].radio)
         }
-        this.id=item.id
+        this.id = item.id
       }
     },
     //付款
     handlepayment() {
-      this.amountNotPayable = 0
-      this.money = this.money
-      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      this.amountNotPayable =
+        this.warehouseList.records[0].tranSettlementReportList //未付金额
+      // this.money = this.money
+      this.tranSettlementReportList =
+        this.warehouseList.records[0].tranSettlementReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-      this.paymentDate = this.paymentDate
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择一条要付款的条目')
+      // this.paymentDate = this.paymentDate
+      if (this.warehouseList.records.length == 0) {
+        this.$message.warning('付款的条目为空')
       } else {
-        for (var i = 0; i < this.modification.length; i++) {
+        for (var i = 0; i < this.warehouseList.records.length; i++) {
           if (
-            this.modification[i].status != '已通过' &&
-            this.modification[i].status != '部分付款'
+            this.warehouseList.records[i].status != '已通过' &&
+            this.warehouseList.records[i].status != '部分付款'
           ) {
             this.$message.warning('只有已通过或部分付款的条目才可进行付款操作')
             return
@@ -660,7 +692,7 @@ export default {
     submitMoney() {
       this.autoSettlementReport.money = this.money
       this.autoSettlementReport.paymentDate = this.paymentDate
-      if (this.modification.length == 0) {
+      if (this.warehouseList.records.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {
         if (
@@ -691,7 +723,7 @@ export default {
           })
           return
         }
-        if (this.money > this.modification[0].amountNotPayable) {
+        if (Number(this.money) > Number(this.alreadyInvoice)) {
           this.$message({
             message: '付款金额不能大于未付金额！',
             type: 'warning',
@@ -704,9 +736,10 @@ export default {
           type: 'warning',
         }).then(() => {
           autopaymoney({
-            tranSettlementReportList: this.modification,
+            tranSettlementReportList: this.warehouseList.records,
             // amountEdPayable: this.modification[0].amountEdPayable,
             // amountNotPayable: this.modification[0].amountNotPayable,
+            tranTypeKey: 3,
             money: this.money,
             paymentDate: this.paymentDate,
             paymentScreenshot: this.paymentScreenshot,
@@ -724,7 +757,6 @@ export default {
               this.getList()
             })
             .catch((response) => {
-              console.log(response)
               EventBus.$emit('error', response.message)
             })
         })
@@ -803,7 +835,8 @@ export default {
     //批量开发票
     handleninvoice() {
       this.amountEdPayable = 0
-      this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
+      this.tranSettlementReportList =
+        this.warehouseList.records[0].tranSettlementReportList
       for (var i = 0; i < this.modification.length; i++) {
         this.amountEdPayable += this.modification[i].amountEdPayable
       }
@@ -878,7 +911,7 @@ export default {
         })
     },
     //设置本次账户
-    bankCard(item,id) {
+    bankCard(item, id) {
       editauto({
         cardNo: item.bankCard,
         id: id,
@@ -943,9 +976,7 @@ export default {
     //装车磅单
     lookloadingImg(row) {
       if (row.loadingImg == null || row.loadingImg == '') {
-        EventBus.$emit(
-          this.$message.warning('暂无磅单信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无磅单信息'))
       } else {
         this.accessoryTFs = true
       }
@@ -954,9 +985,7 @@ export default {
     //卸车磅单
     lookunloadingImg(row) {
       if (row.unloadingImg === null || row.unloadingImg === '') {
-        EventBus.$emit(
-          this.$message.warning('暂无磅单信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无磅单信息'))
       } else {
         this.accesscard = true
       }
@@ -965,9 +994,7 @@ export default {
     //付款截图
     lookpaymentScreenshot(row) {
       if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
-        EventBus.$emit(
-          this.$message.warning('暂无付款截图信息')
-        )
+        EventBus.$emit(this.$message.warning('暂无付款截图信息'))
       } else {
         this.paymentImg = true
       }
@@ -975,7 +1002,7 @@ export default {
     },
     //审核
     audit(item, index, status, status2, reason) {
-      if (index < this.modification.length) {
+      if (index < this.warehouseList.records.length) {
         posthandle({
           taskId: item.taskId,
           approved: status,
@@ -984,24 +1011,24 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            this.audit(this.modification[index + 1], index + 1, status)
+            this.audit(this.warehouseList.records[index + 1], index + 1, status)
           })
           .catch((req) => {
             this.$message.warning(req.message)
           })
       } else {
-        if (status==true) {
+        if (status == true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (status==false) {
+        } else if (status == false) {
           this.$message.success('驳回成功')
           this.getList()
-          }
+        }
       }
     },
     handlereject(status) {
       var that = this
-      if (this.modification.length == 0) {
+      if (this.warehouseList.records.length == 0) {
         this.$message.warning('请选择要驳回的条目')
       } else {
         this.$confirm(`是否确定驳回？`, {
@@ -1009,7 +1036,7 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          that.audit(this.modification[0], 0, false, true, '已驳回')
+          that.audit(this.warehouseList.records[0], 0, false, true, '已驳回')
         })
       }
     },
@@ -1033,15 +1060,15 @@ export default {
     },
     handlepass() {
       var that = this
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要通过的条目')
+      if (this.warehouseList.records.length == 0) {
+        this.$message.warning('没有要审核的！')
       } else {
         this.$confirm(`是否确定通过？`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          that.audit(this.modification[0], 0, true, 2)
+          that.audit(this.warehouseList.records[0], 0, true, 2)
         })
       }
     },
@@ -1052,79 +1079,79 @@ export default {
       this.searchType = status
       this.getList()
     },
-  contractchange(e) {
+    contractchange(e) {
       this.contractNo = e
       this.taskNoList = []
-       this.taskNo = ""
-      this.processNoList= []
-      this.processNo = ""
-       getYunShuNumber({
-       contractNo:this.contractNo,
-       flag:1
+      this.taskNo = ''
+      this.processNoList = []
+      this.processNo = ''
+      getYunShuNumber({
+        contractNo: this.contractNo,
+        flag: 1,
       })
         .toPromise()
         .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
+          for (let i = 0; i < response.length; i++) {
             this.taskNoList.push({
-              taskNoKey : i,
-              taskNoValue : response[i].taskNo,
-              processNo: response[i].tranProcessInfoList
-          }) 
+              taskNoKey: i,
+              taskNoValue: response[i].taskNo,
+              processNo: response[i].tranProcessInfoList,
+            })
           }
         })
     },
-    taskNochange(e){
+    taskNochange(e) {
       this.taskNo = e
-      this.processNoList= []
-      this.processNo = ""
-      for(let i = 0 ; i < this.taskNoList.length ; i++ ){
-        if(e == this.taskNoList[i].taskNoValue){
-          for(let j = 0 ; j < this.taskNoList.length ; j++){
+      this.processNoList = []
+      this.processNo = ''
+      for (let i = 0; i < this.taskNoList.length; i++) {
+        if (e == this.taskNoList[i].taskNoValue) {
+          for (let j = 0; j < this.taskNoList.length; j++) {
             this.processNoList.push({
-             processNoKey:i,
-             processNoValue:this.taskNoList[i].processNo[j].processNo,
-             actualFreight : this.taskNoList[i].processNo[j].actualFreight,
-             id:this.taskNoList[i].processNo[j].id,
-             tranPriceIng:this.taskNoList[i].processNo[j].tranPrice,
-              priceStatus:this.taskNoList[i].processNo[j].priceStatus
-           })
+              processNoKey: i,
+              processNoValue: this.taskNoList[i].processNo[j].processNo,
+              actualFreight: this.taskNoList[i].processNo[j].actualFreight,
+              id: this.taskNoList[i].processNo[j].id,
+              tranPriceIng: this.taskNoList[i].processNo[j].tranPrice,
+              priceStatus: this.taskNoList[i].processNo[j].priceStatus,
+            })
           }
         }
       }
     },
-    processNochange(e){
+    processNochange(e) {
       this.processNo = e
-      for(let i = 0 ; i < this.processNoList.length ; i++){
-        if(this.processNoList[i].processNoValue == e){
+      for (let i = 0; i < this.processNoList.length; i++) {
+        if (this.processNoList[i].processNoValue == e) {
           this.actualFreight = this.processNoList[i].actualFreight
-          this.processNoId =this.processNoList[i].id
+          this.processNoId = this.processNoList[i].id
           this.tranPriceIng = this.processNoList[i].tranPriceIng
           this.priceStatus = this.processNoList[i].priceStatus
         }
       }
       this.getList()
     },
-     actualFreightchange(){
+    actualFreightchange() {
       // this.actualFreight
       this.$confirm(`是否提交实际总价？`, {
-          cancelButtonText: '取消',
-          confirmButtonText: '确定',
-          type: 'warning',
-        }).then(() => {
-          SetYunShuPrice({
-        actualFreight:this.actualFreight,
-        id:this.processNoId,
-        flag :3
-      })
-        .toPromise()
-        .then((response) => {
-          this.$notify.success({
-                title: '成功',
-                message: '实际运费总价设置成功',
-              })
-         this.textShow = false
-        })
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        SetYunShuPrice({
+          actualFreight: this.actualFreight,
+          id: this.processNoId,
+          flag: 3,
         })
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '实际运费总价设置成功',
+            })
+            this.textShow = false
+          })
+      })
     },
     updated() {
       this.$nextTick(() => {
@@ -1173,35 +1200,41 @@ export default {
         searchType: this.searchType,
         contractNo: this.contractNo,
         manualFlag: this.manualFlag,
-        taskNo:this.taskNo,
-         processNo:this.processNo
+        taskNo: this.taskNo,
+        processNo: this.processNo,
       })
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
-            response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
-            if(this.processNo){
-                this.amountEdPayable += response.records[i].amountEdPayable // 已付
-                 this.alreadyInvoice += response.records[i].alreadyInvoice//未付
-                this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
-              } 
+            response.records[i].amountNotPayable =
+              response.records[i].amountIngPayable -
+              response.records[i].amountEdPayable
+            if (this.processNo) {
+              if (response.records[0].paymentScreenshot) {
+                this.paymentScreenshotList =
+                  response.records[0].paymentScreenshot.split(',') //附件地址取运输阶段第一条
+                this.paymentScreenshot = response.records[0].paymentScreenshot
+              }
+            }
           }
+          this.amountEdPayable = response.records[0].amountEdPayable // 已付
+          this.alreadyInvoice = response.records[0].amountNotPayable //未付
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
-           this.contractNoList=[]
+      this.contractNoList = []
       getYunShuXiaLa({
-        flag:1,
+        flag: 1,
       })
         .toPromise()
         .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
+          for (let i = 0; i < response.length; i++) {
             this.contractNoList.push({
-              constKey : i,
-              contractNo : response[i]
-          }) 
+              constKey: i,
+              contractNo: response[i],
+            })
           }
           this.contractNoList.unshift({ contractNo: '全部合同' })
           this.options = this.contractNoList
@@ -1211,8 +1244,11 @@ export default {
       console.log(file)
     },
     handlePictureCardPreview(file) {
-      this.paymentScreenshot = file.url
-
+      if (this.paymentScreenshot) {
+        this.paymentScreenshot += ',' + file.url
+      } else {
+        this.paymentScreenshot = file.url
+      }
       this.dialogVisible = true
     },
     handleDownload(file) {
@@ -1292,7 +1328,7 @@ export default {
           this.historyList = response
         })
     },
-   
+
     total() {},
   },
 }
@@ -1544,33 +1580,33 @@ hr {
   text-align: center;
   height: 40px;
 }
-/deep/.freightSet .el-input__inner{
- width: 100px;
+/deep/.freightSet .el-input__inner {
+  width: 100px;
 }
-.freightSet{
+.freightSet {
   margin: 10px 0 0 20px;
   display: flex;
-  width:800px;
-  .span_text{
+  width: 800px;
+  .span_text {
     margin-left: 20px;
     line-height: 30px;
   }
 }
-/deep/.freightSet .el-input{
+/deep/.freightSet .el-input {
   width: 44%;
 }
-.findValue{
+.findValue {
   width: 300px;
   margin-left: 5px;
 }
-/deep/.freightSet .el-input{
+/deep/.freightSet .el-input {
   width: 44%;
 }
-.findValue{
+.findValue {
   width: 300px;
   margin-left: 5px;
 }
-.img_css{
+.img_css {
   width: 200px;
   height: 200px;
 }

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -159,45 +159,38 @@
           type="selection"
           width="55"
         ></el-table-column>
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
+        <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column
           class="table_td"
           prop="warehouseName"
-          width="120"
           label="仓库"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="carNo"
-          width="120"
           label="车牌号"
         ></el-table-column>
         <el-table-column
           class="table_td"
           prop="warehousingDate"
-          width="100"
           label="入库日期"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="grossWeight"
           label="毛重"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="tare"
           label="皮重"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="deductionWeight"
           label="扣重"
         ></el-table-column>
         <el-table-column
-          width="100"
           class="table_td"
           prop="netWeight"
           label="净重"

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -558,6 +558,12 @@
       },
       //提交按钮
       submit() {
+         if (!this.deptBudgetList.tranPrice) {
+          this.$message({
+            message: '请设置运输总价！',
+            type: 'warning',
+          })
+        } else {
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
           if (!this.deptBudgetList.tranCarInfoList[i].driver) {
             this.$message({
@@ -681,6 +687,7 @@
           .catch(() => {
             return false
           })
+        }
       },
       handleClose() {
         this.accessoryTFs = false

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -29,7 +29,6 @@
     >
       <div class="small-title" style="font-size: 16px">任务详情</div>
        <ws-info-table>
-
         <ws-form-item label="任务编号" span="1" prop="processNo">
           {{ deptBudgetList.processNo }}
         </ws-form-item>
@@ -393,6 +392,13 @@ export default {
       console.log(data, files, url)
     },
     submit() {
+        if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输总价！',
+          type: 'warning',
+        })
+      }
+      else{
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         if (!this.deptBudgetList.tranCarInfoList[i].driver) {
           this.$message({
@@ -482,6 +488,7 @@ export default {
         .catch(() => {
           return false
         })
+      }
     },
      //审核
     examine(){

src/views/warehouse/warehouseManagementGross.vue

@@ -637,6 +637,7 @@ export default {
       disabled2: true,
       tranCarInfoList: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
+      secretaryWeigher: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1416,8 +1417,8 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
@@ -1940,8 +1941,8 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -552,6 +552,7 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
+      skinInspector: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1372,6 +1373,7 @@ export default {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.dataList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 3
               this.dataList.grossWeight = (this.dataList.grossWeight/1000).toFixed(2)

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -464,6 +464,7 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
+      secretaryWeigher: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1113,6 +1114,7 @@ export default {
           this.$refs.dataList.validate((valid) => {
             if (valid) {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
+              this.dataList.secretaryWeigher = sessionStorage.getItem('ws-pf_staffName')
               this.dataList.inOutFlag = 1
               this.dataList.statusFlag = 3
               this.dataList.grossWeight /= 1000

src/views/warehouse/warehouseManagementTare.vue

@@ -460,6 +460,7 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
+      skinInspector: sessionStorage.getItem('ws-pf_staffName'),
       deptCircularPage: {},
       packtypeList: {},
       date: {
@@ -1002,8 +1003,8 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId =  sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
               this.deptBudgetList.inOutFlag = 1
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 1
@@ -1432,6 +1433,7 @@ export default {
                 this.deptBudgetList.deductionAmount *= 1000
                 this.deptBudgetList.deductionWeight /= 1000
             this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+            this.deptBudgetList.skinInspector = sessionStorage.getItem('ws-pf_staffName')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3
             addstorageputList(this.deptBudgetList)