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

src/views/houseSelfCollect/paymentManagement.vue

@@ -121,7 +121,7 @@
                     scope.row.status == '待结算'
                   " @click="settlement(1, scope.row)">结算</el-button>
           </span>
-          <el-button v-if="scope.row.approveStatus || scope.row.status == '已驳回'" @click="settlement(2, scope.row)"
+          <el-button @click="settlement(2, scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`">查看</el-button>
           <el-button v-if="
               scope.row.approveStatus ||
@@ -329,7 +329,7 @@ import download from '../../components/WsDownload/download'
         deptCircularPage: {},
         deptBudgetTotal: 0,
         paymentForm: false,
-        searchType: -1,
+        searchType: 1,
         searchTypeText: '',
         searchKeyWord: '',
         warehouseList: [],
@@ -1047,20 +1047,20 @@ import download from '../../components/WsDownload/download'
       },
       selectInit(row) {
         //在这里一定要记得类型匹配的上。
-        // if (row.status != '已驳回') {
-        //   if (
-        //     row.taskId == null &&
-        //     row.status != '已通过' &&
-        //     row.status != '部分付款'
-        //   ) {
-        //     return false
-        //   } else {
-        //     return true
-        //   }
-        // } else {
-        //   return true
-        // }
-        return true
+        if (row.status != '已驳回') {
+          if (
+            row.taskId == null &&
+            row.status != '已通过' &&
+            row.status != '部分付款'
+          ) {
+            return false
+          } else {
+            return true
+          }
+        } else {
+          return true
+        }
+        // return true
       },
       handleSelectionChange(val) {
         this.modification = val

src/views/houseSelfCollect/weightCheck.vue

@@ -429,7 +429,9 @@
       },
       async closePort() {
         console.log('closePort');
-        this.reader.cancel()
+        if(this.reader){
+          this.reader.cancel()
+        }
       },
       async openPort() {
         console.log('openPort', navigator);
@@ -725,7 +727,9 @@
                           grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {
-                            this.reader.cancel()
+                            if(this.reader){
+                              this.reader.cancel()
+                            }
                             this.$notify.success({
                               title: '成功',
                               message: '保存成功',
@@ -752,7 +756,9 @@
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  this.reader.cancel()
+                  if(this.reader){
+                    this.reader.cancel()
+                  }
                   this.$notify.success({
                     title: '成功',
                     message: '保存成功',

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -87,62 +87,62 @@
           </el-select>
         </el-col>
       </el-row>
-      <div v-if="contractNo != ''">
-        <span v-if="orderList.seller"
-          >卖方: {{ orderList.seller }} </span
-        >
-        <span v-else>卖方:--</span>
-        <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
-        <span v-else>货名:--</span>
-        
-        <span v-if="orderList.weight"
-          >合同重量: {{ orderList.weight }} 吨</span
-        >
-        <span v-else>合同重量: 0 吨</span>
+      <el-row v-if="contractNo != ''" class="content2">
+        <div class="content2-item">
+          <span v-if="orderList.seller" class="seller"
+            >卖方: {{ orderList.seller }} </span
+          >
+          <span v-else>卖方:--</span>
+          <div class="row2">
+            <span v-if="orderList.goodsName">货名: {{ orderList.goodsName }}</span>
+            <span v-else>货名:--</span>
+            
+            <span v-if="orderList.weight"
+              >合同重量: {{ orderList.weight }} 吨</span
+            >
+            <span v-else>合同重量: 0 吨</span>
 
-        <span v-if="settlementWeight1"
-          >入库量: {{ settlementWeight1 }} 吨</span
-        >
-        <span v-else>入库量: 0 吨</span>
+            <span v-if="settlementWeight1"
+              >入库量: {{ settlementWeight1 }} 吨</span
+            >
+            <span v-else>入库量: 0 吨</span>
 
-        <span v-if="orderList.unitContractPrice"
-          >合同单价: {{ orderList.unitContractPrice }} 元/吨</span
-        >
-        <span v-else>合同单价: 0 元/吨</span>
+            <span v-if="orderList.unitContractPrice"
+              >合同单价: {{ orderList.unitContractPrice }} 元/吨</span
+            >
+            <span v-else>合同单价: 0 元/吨</span>
 
-        <span v-if="payingMoney"
-          >应付: {{ payingMoney }} 元</span
-        >
-        <span v-else>应付: 0 元</span>
+            <span v-if="payingMoney"
+              >应付: {{ payingMoney }} 元</span
+            >
+            <span v-else>应付: 0 元</span>
 
-        <span v-if="payedMoney"
-          >已付: {{ payedMoney }} 元</span
-        >
-        <span v-else>已付: 0 元</span>
+            <span v-if="payedMoney"
+              >已付: {{ payedMoney }} 元</span
+            >
+            <span v-else>已付: 0 元</span>
 
-        <span v-if="payNotMoney"
-          >未付: {{ payNotMoney }} 元</span
-        >
-        <span v-else>未付: 0 元</span>
+            <span v-if="payNotMoney"
+              >未付: {{ payNotMoney }} 元</span
+            >
+            <span v-else>未付: 0 元</span>
 
-        <span v-if="orderList.deposit"
-          >定金: {{ orderList.deposit }} 元 
-          <!-- {{ orderList.depositUrl }} -->
-           <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian()"
-            alt=""
-          />
-          <!-- <span v-if="addressUrlArray.length > 0">{{
-            addressUrlArray.length
-          }}</span> -->
-          </span
-        >
-        <span v-else>定金: 0 元</span>
-      </div>
+            <span v-if="orderList.deposit"
+              >定金: {{ orderList.deposit }} 元 
+              <!-- {{ orderList.depositUrl }} -->
+              <img
+                width="18"
+                height="20"
+                style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/fujian.png"
+                @click="fujian()"
+                alt=""
+              />
+              </span>
+            <span v-else>定金: 0 元</span>
+          </div>
+        </div>
+      </el-row>
       <el-table
         class="wenzi"
         :data="warehouseList.records"
@@ -668,8 +668,10 @@ export default {
           this.$t('system.noticeCircular.NoInformation')
         )
       }
-      this.appendixIdss = this.orderList.depositUrl
-      this.accessoryTFs = true
+      else{
+          this.accessoryTFs = true
+          this.appendixIdss = this.orderList.depositUrl
+      }
     },
      //定金附件
     fujian1(item) {
@@ -1198,6 +1200,14 @@ export default {
   padding: 0 4px !important;
   position: relative;
 }
+.content2-item {
+  padding: 10px;
+}
+.content2 {
+  margin-top: 10px;
+  border-radius: 5px;
+  background: #F0F3FE;
+}
 .record:after {
   position: absolute;
   content: '';
@@ -1299,6 +1309,15 @@ export default {
   position: absolute;
   left: 0;
 }
+.seller {
+  font-size: 16px;
+  font-weight: 600;
+  color: #323233;
+  line-height: 24px;
+}
+.row2>span {
+  margin-right: 20px;
+}
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -107,7 +107,7 @@
       >
         <div class="trucks">
           <div class="driver">
-            <span class="driver">货车信息-{{ index + 1 }}</span>
+            货车信息-{{ index + 1 }}
             <img
               width="22"
               height="22"
@@ -829,14 +829,14 @@ export default {
         EventBus.$emit('error', '司机手机号输入有误')
         return
       }
-      if (!this.deptBudgetList.numberCard) {
-        EventBus.$emit('error', '司机身份证不能为空')
-        return
-      }
-      if (this.deptBudgetList.numberCard.length != 18) {
-        EventBus.$emit('error', '司机身份证号输入错误')
-        return
-      }
+      // if (!this.deptBudgetList.numberCard) {
+      //   EventBus.$emit('error', '司机身份证不能为空')
+      //   return
+      // }
+      // if (this.deptBudgetList.numberCard.length != 18) {
+      //   EventBus.$emit('error', '司机身份证号输入错误')
+      //   return
+      // }
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].carNumber == '') {
           EventBus.$emit('error', '车牌号不能为空')
@@ -846,106 +846,106 @@ export default {
           EventBus.$emit('error', '车牌号输入错误')
           return
         }
-        if (this.freightspace[i].carLoad == '') {
-          EventBus.$emit('error', '载重不能为空')
-          return
-        }
-        if (this.freightspace[i].carLength > 50) {
-          EventBus.$emit('error', '载重量输入错误')
-          return
-        }
-        if (this.freightspace[i].yearManufacture == '') {
-          EventBus.$emit('error', '出厂年份不能为空')
-          return
-        }
-        if (this.freightspace[i].yearManufacture.length != 4) {
-          EventBus.$emit('error', '出厂年份输入错误')
-          return
-        }
-      }
-      for (var i = 0; i < this.freightspace1.length; i++) {
-        if (this.freightspace1[i].bankCard == '') {
-          EventBus.$emit('error', '银行卡账号不能为空')
-          return
-        }
-        if (this.freightspace1[i].bankDeposit == '') {
-          EventBus.$emit('error', '开户行不能为空')
-          return
-        }
-        if (this.freightspace1[i].bankDepositBranch == '') {
-          EventBus.$emit('error', '开户支行不能为空')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeName == ''
-        ) {
-          EventBus.$emit('error', '收款人姓名不能为空')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeNumberCard == ''
-        ) {
-          EventBus.$emit('error', '收款人身份证号码不能为空')
-          return
-        }
-        if (
-          (this.freightspace1[i].accountTypeFlag == 1 &&
-            this.freightspace1[i].payeeName.length < 2) ||
-          (this.freightspace1[i].accountTypeFlag == 1 &&
-            this.freightspace1[i].payeeName.length > 10)
-        ) {
-          EventBus.$emit('error', '收款人姓名输入错误')
-          return
-        }
-        console.log(this.freightspace1[i].payeeNumberCard != 18)
-        if (
-          this.freightspace1[i].accountTypeFlag == 1 &&
-          this.freightspace1[i].payeeNumberCard.length != 18
-        ) {
-          EventBus.$emit('error', '收款人身份证号输入错误')
-          return
-        }
-        if (
-          this.freightspace1[i].accountTypeFlag == 2 &&
-          this.freightspace1[i].compName == ''
-        ) {
-          EventBus.$emit('error', '企业名称不能为空')
-          return
-        }
-        if (
-          (this.freightspace1[i].accountTypeFlag == 2 &&
-            this.freightspace1[i].compName.length < 2) ||
-          (this.freightspace1[i].accountTypeFlag == 2 &&
-            this.freightspace1[i].compName.length > 30)
-        ) {
-          EventBus.$emit('error', '企业名称输入有误')
-          return
-        }
-      }
-      if (!this.addressUrls.travel) {
-        EventBus.$emit('error', '行驶证不能为空')
-        return
-      }
-      if (!this.addressUrls.drive) {
-        EventBus.$emit('error', '驾驶证不能为空')
-        return
+        // if (this.freightspace[i].carLoad == '') {
+        //   EventBus.$emit('error', '载重不能为空')
+        //   return
+        // }
+        // if (this.freightspace[i].carLength > 50) {
+        //   EventBus.$emit('error', '载重量输入错误')
+        //   return
+        // }
+        // if (this.freightspace[i].yearManufacture == '') {
+        //   EventBus.$emit('error', '出厂年份不能为空')
+        //   return
+        // }
+        // if (this.freightspace[i].yearManufacture.length != 4) {
+        //   EventBus.$emit('error', '出厂年份输入错误')
+        //   return
+        // }
       }
+      // for (var i = 0; i < this.freightspace1.length; i++) {
+      //   if (this.freightspace1[i].bankCard == '') {
+      //     EventBus.$emit('error', '银行卡账号不能为空')
+      //     return
+      //   }
+      //   if (this.freightspace1[i].bankDeposit == '') {
+      //     EventBus.$emit('error', '开户行不能为空')
+      //     return
+      //   }
+      //   if (this.freightspace1[i].bankDepositBranch == '') {
+      //     EventBus.$emit('error', '开户支行不能为空')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeName == ''
+      //   ) {
+      //     EventBus.$emit('error', '收款人姓名不能为空')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeNumberCard == ''
+      //   ) {
+      //     EventBus.$emit('error', '收款人身份证号码不能为空')
+      //     return
+      //   }
+      //   if (
+      //     (this.freightspace1[i].accountTypeFlag == 1 &&
+      //       this.freightspace1[i].payeeName.length < 2) ||
+      //     (this.freightspace1[i].accountTypeFlag == 1 &&
+      //       this.freightspace1[i].payeeName.length > 10)
+      //   ) {
+      //     EventBus.$emit('error', '收款人姓名输入错误')
+      //     return
+      //   }
+      //   console.log(this.freightspace1[i].payeeNumberCard != 18)
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 1 &&
+      //     this.freightspace1[i].payeeNumberCard.length != 18
+      //   ) {
+      //     EventBus.$emit('error', '收款人身份证号输入错误')
+      //     return
+      //   }
+      //   if (
+      //     this.freightspace1[i].accountTypeFlag == 2 &&
+      //     this.freightspace1[i].compName == ''
+      //   ) {
+      //     EventBus.$emit('error', '企业名称不能为空')
+      //     return
+      //   }
+      //   if (
+      //     (this.freightspace1[i].accountTypeFlag == 2 &&
+      //       this.freightspace1[i].compName.length < 2) ||
+      //     (this.freightspace1[i].accountTypeFlag == 2 &&
+      //       this.freightspace1[i].compName.length > 30)
+      //   ) {
+      //     EventBus.$emit('error', '企业名称输入有误')
+      //     return
+      //   }
+      // }
+      // if (!this.addressUrls.travel) {
+      //   EventBus.$emit('error', '行驶证不能为空')
+      //   return
+      // }
+      // if (!this.addressUrls.drive) {
+      //   EventBus.$emit('error', '驾驶证不能为空')
+      //   return
+      // }
       if (!this.addressUrls.way) {
         this.addressUrls.way='$'
       }
       if (!this.addressUrls.qualification) {
         this.addressUrls.qualification='$'
       }
-      if (!this.addressUrls.identityjust) {
-        EventBus.$emit('error', '身份证正面不能为空')
-        return
-      }
-      if (!this.addressUrls.identityagainst) {
-        EventBus.$emit('error', '身份证反面不能为空')
-        return
-      }
+      // if (!this.addressUrls.identityjust) {
+      //   EventBus.$emit('error', '身份证正面不能为空')
+      //   return
+      // }
+      // if (!this.addressUrls.identityagainst) {
+      //   EventBus.$emit('error', '身份证反面不能为空')
+      //   return
+      // }
       var arr = []
       var arr1=[]
       for (let key in this.addressUrls) {
@@ -1140,7 +1140,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   // width: 110px;
-  width: 40%;
+  width: 50%;
   text-align: center;
 }
 /deep/.ws-info-table .el-form-item {
@@ -1178,11 +1178,11 @@ export default {
   border: 1px solid #d8dce6;
   padding: 12px;
   border-radius: 3px;
-  margin: 10px 0;
+  // margin: 8px 0;
   border: 0px;
   font-size: 14px;
   color: #8890b1;
-  width: 100%;
+  // width: 100%;
 }
 /deep/.trucks .ws-info-table,
 /deep/.trucks .ws-info-table .el-form-item,

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -973,7 +973,7 @@ export default {
   background: #f6f7fc;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
+  padding: 0 10px;
   border-left: 1px solid #cdd2dc;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
@@ -1121,7 +1121,7 @@ export default {
 }
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label {
   color: #8890b1;
-  width: 40%;
+  width: 50%;
 }
 /deep/.trucks .el-table:before {
   height: 0;

src/views/warehouse/warehouseManagementRecord.vue

@@ -449,6 +449,7 @@
 			record(status, status1) {
 				this.status = status1
 				this.searchType = status
+				this.currentPage = '1'
 				this.getList()
 			},
 			// 上传附件

src/views/workNotification/utils/index.js

@@ -18,6 +18,9 @@ export function code2Url (type, code, state) {
       // 判断 运输
     case 'Tran':
       return tran(code, state)
+        // 判断 付款
+    case 'PAYMENT':
+      return payment(code, state)
     default:
       return ''
   }
@@ -805,6 +808,13 @@ export function tran (code, state) {
   }
   return undefined
 }
+export function payment (code, state) {
+  if (code === 'PAYMENT-MANAGEMENT-APPROVE') {
+    // 付款管理
+    return 'paymentManagement'
+  }
+  return undefined
+}
 // 调度
 export function checkDispatch (code, state) {
   let url = ''