Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -3455,13 +3455,14 @@ export default {
     returnBack(row) {
       this.$refs.KHSelect[0].updateData(row.id)
       getKHList({corpType: 'KH', belongtocompany: row.id}).then(res => {
-        this.form.corpId = res.data.data.records.length > 0? res.data.data.records[0].id: null
-        if (this.form.corpId) {
-          this.getCorpRow({adminProfiles: res.data.data.records[0].adminProfiles,
-            id: res.data.data.records[0].id,
-            packageRemarks: res.data.data.records[0].packageRemarks,
-            paymentType: res.data.data.records[0].paymentType})
-        }
+        //注释自动带出客户全称
+        // this.form.corpId = res.data.data.records.length > 0? res.data.data.records[0].id: null
+        // if (this.form.corpId) {
+        //   this.getCorpRow({adminProfiles: res.data.data.records[0].adminProfiles,
+        //     id: res.data.data.records[0].id,
+        //     packageRemarks: res.data.data.records[0].packageRemarks,
+        //     paymentType: res.data.data.records[0].paymentType})
+        // }
       })
       getKHList({corpType: 'GYS', belongtocompany: row.id}).then(res => {
         this.form.productionPlant = res.data.data.records.length > 0? res.data.data.records[0].id: null;

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -800,10 +800,12 @@
         if (this.category == 2) {
           GYSGetBank(row.id).then(res =>{
             this.$set(this.form,"bankList",res.data)
+            console.log(res.data)
             if (this.form.bankList.length > 0) {
               this.form.accountNo = this.form.bankList[0].accountNo
               this.form.accountName = this.form.bankList[0].accountName
               this.form.accountBank = this.form.bankList[0].accountBank
+              this.form.subjectNumber = this.form.bankList[0].subjectNumber
             }
           })
         }

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -40,13 +40,20 @@
           <el-button
               type="warning"
               size="small"
-              v-if="goodsForm.status > 0 && !(roleName.indexOf('总调度') !== -1)"
+              v-if="goodsForm.status > 0 && !(roleName.indexOf('总调度') !== -1) && !(goodsForm.status > 3 && !(roleName.indexOf('车队') !== -1))"
               :disabled="
-            !(roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
+            !(roleName.indexOf('业务员') !== -1||roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
           >变更
           </el-button>
           <el-button
+              type="warning"
+              size="small"
+              v-if="goodsForm.status > 3 && roleName.indexOf('车队') !== -1 && goodsForm.status !== 5"
+              @click="confirmChangeTwo"
+          >变更车
+          </el-button>
+          <el-button
               type="success"
               v-if="goodsForm.status === 0 && typeTwo === false"
               v-show="roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
@@ -97,7 +104,7 @@
           <el-button
               type="primary"
               :disabled="goodsForm.status === 5"
-              v-show="(roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('分管调度') !== -1||roleName.indexOf('administrator') !== -1||roleName.indexOf('admin') !== -1"
+              v-show="(roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)||roleName.indexOf('分管调度') !== -1||roleName.indexOf('administrator') !== -1||roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('车队') !== -1 && this.goodsForm.status >3 &&  goodsForm.status !== 5)"
               size="small"
               :loading="type"
               v-if="!typeTwo"
@@ -2586,6 +2593,16 @@ export default {
       // }
       // })
     },
+    confirmChangeTwo(){
+      if (this.roleName.indexOf('车队') !== -1 && this.goodsForm.status >3){
+        this.goodsOptionFormTwo.disabled = false
+        this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
+        this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
+        this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
+        this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = false
+        this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = true
+      }
+    },
     //变更保存
     changeSaving() {
       this.$refs['goodsFormE'].validate((valid, doneE) => {

src/views/wel/home/landTransportation/components/quick-launch.vue

@@ -23,6 +23,10 @@
           <i class="tradingIcon icon-ship" style="color:#7db4ff"></i>
           <span>跟踪</span>
         </div>
+        <div class="content-icon" @click="track?inPage('sh'):'JZ'">
+          <i class="tradingIcon icon-ship" style="color:#efc860"></i>
+          <span>散货</span>
+        </div>
         <div class="content-icon" @click="sBook?inPage('lytz'):'JZ'">
           <i class="tradingIcon icon-sales" style="color:#143056"></i>
           <span>台账</span>
@@ -166,6 +170,9 @@ export default {
         case "gz":
           this.$router.push("/landTransportation/driver/index");
           break;
+        case "sh":
+          this.$router.push("/landTransportation/bulkCargo/index");
+          break;
         case "lytz":
           this.$router.push("/landTransportation/reportAnalysis/index");
           break;