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

# Conflicts:
#	vue.config.js

src/views/statisticalReport/component/routers/route.js

@@ -96,7 +96,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'stockPurchaseReceiptReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
+        module: 'report.goodsProcurementInReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -111,7 +111,7 @@ const statisticalReportRouter = {
       meta: {
         title: 'stockSaleOutReportList',
         shortcutEntrance: 'statisticalReport',
-        module: 'report.saleOutReport',
+        module: 'report.goodsSaleOutReport',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -26,31 +26,31 @@
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.view`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="handleAudit()"
             >通过</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.view`"
+            v-hasPermission="`report.goodsProcurementInReport.view`"
             @click="handlereject()"
             >驳回</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.payment`"
+            v-hasPermission="`report.goodsProcurementInReport.payment`"
             @click="handlepayment"
             >付款</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.edit`"
+            v-hasPermission="`report.goodsProcurementInReport.edit`"
             @click="addRemarks()"
             >备注</ws-button
           >
           <ws-button
             type="primary"
-            v-hasPermission="`report.procurementInReport.carry`"
+            v-hasPermission="`report.goodsProcurementInReport.carry`"
             @click="dis()"
             >定金</ws-button
           >

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -4,11 +4,11 @@
 		<el-scrollbar style="height: 100%">
 			<el-row>
 				<el-col style="padding-left: 15px" :span="16">
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.view`" @click="adopt()">备注
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="adopt()">备注
 					</ws-button>
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.view`" @click="depositbutton()">定金
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.view`" @click="depositbutton()">定金
 					</ws-button>
-					<ws-button type="primary" v-hasPermission="`report.saleOutReport.payment`" @click="handlecollect()">收款
+					<ws-button type="primary" v-hasPermission="`report.goodsSaleOutReport.payment`" @click="handlecollect()">收款
 					</ws-button>
 				</el-col>
 				<el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -173,12 +173,12 @@
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                    deptBudgetList.tranCarInfoList.length>0 && deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
                 >1</span>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                     deptBudgetList.tranCarInfoList.length>0 && !deptBudgetList.tranCarInfoList[0].loadPoundImg
                   "
                 >未上传</span>
               </template>
@@ -589,28 +589,27 @@ export default {
     },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].carNo) {
-            this.$message({
-              message: '车牌号不能为空！',
-              type: 'warning'
-            })
-            return
-          }
+          // if (!this.freightspace[i].driver) {
+          //   this.$message({
+          //     message: '司机姓名不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.freightspace[i].driverPhone) {
+          //   this.$message({
+          //     message: '司机电话不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
+          // if (!this.freightspace[i].carNo) {
+          //   this.$message({
+          //     message: '车牌号不能为空！',
+          //     type: 'warning'
+          //   })
+          //   return
+          // }
           if (!this.freightspace[i].loadNetWeight) {
             this.$message({
               message: '装车净重不能为空！',
@@ -635,7 +634,7 @@ export default {
             })
             return
           }
-        }
+        
       }
       if (sessionStorage.getItem('sh-msg')) {
         this.validateFunc()
@@ -665,14 +664,12 @@ export default {
         .then(response => {
           this.deptBudgetList = response
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          if(response.tranCarInfoList[0].driver){
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          }
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.$set(
-            this.deptBudgetList,
-            'sendDateStart',
-            response.tranCarInfoList[0].sendDateStart
-          )
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart)
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -132,6 +132,7 @@
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
+              v-hasPermission="`transportationTask.transportation.transportationInfo.exe`" 
               size="small"
               @click="examine()"
               >审核中</el-button