前端孟祥旭

src/api/V2/transport/index.js

@@ -41,4 +41,8 @@ export const API_GET_AUTOMOBILE_SEE = "/tranProcessInfo/getTranProcess"
 export const API_GET_AUTOMOBILE_NAME = "/driverViewInfo/selectDriverName"
 //
 export const API_GET_AUTOMOBILE_ARRANGE = "/driverViewInfo/selectDriverDetail"
+//发货反馈
+export const API_POST_AUTOMOBILE_FEEDBACK = '/tranProcessInfo/api/insertTranCar'
+//更改反馈状态
+export const API_POST_AUTOMOBILE_STATE = '/tranProcessInfo/api/editFeedbackStatus'
 

src/model/transport/index.js

@@ -24,6 +24,8 @@ import {
     API_GET_AUTOMOBILE_SEE,
     API_GET_AUTOMOBILE_ARRANGE,
     API_GET_AUTOMOBILE_NAME,
+    API_POST_AUTOMOBILE_FEEDBACK,
+    API_POST_AUTOMOBILE_STATE,
 
 } from '@/api/V2/transport'
 // 司机列表
@@ -68,4 +70,8 @@ export const seeCat = appRx.get(API_GET_AUTOMOBILE_SEE, errorCatcher, errorHandl
 export const nameXiala = appRx.get(API_GET_AUTOMOBILE_NAME, errorCatcher, errorHandle, filter)
 //司机其他信息
 export const arrange = appRx.get(API_GET_AUTOMOBILE_ARRANGE, errorCatcher, errorHandle, filter)
+//发货反馈
+export const feedback = appRx.post(API_POST_AUTOMOBILE_FEEDBACK, errorCatcher, errorHandle, filter)
+//更改反馈状态
+export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
 

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -199,6 +199,12 @@
       >
         <div class="driver">
           运输阶段{{ index + 1 }} {{ item.processNo }}
+          <el-checkbox
+            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+            v-model="item.endFlag"
+            label="1"
+            >最终阶段</el-checkbox
+          >
           <img
             width="22"
             height="22"

src/views/tranManagement/tranManagementDriver.vue

@@ -301,7 +301,14 @@
       @on-cancel="handleClose"
     >
       <p>查看附件</p>
-      <ws-upload
+      <div
+        style="display: inline-block; margin: 5px"
+        v-for="item in appendixIdss"
+      >
+        <img width="100" height="100" :src="item" alt="" />
+      </div>
+
+      <!-- <ws-upload
         ref="upload"
         table-name="maintain_work_order"
         oss-key="mainPlan"
@@ -312,7 +319,7 @@
         :size-limit="size"
         @uploadSuccess="uploadSuccess"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      /> -->
     </WinseaContentModal>
     <!-- <WinseaContentModal
       v-model="accessoryTFs"
@@ -412,6 +419,7 @@ export default {
           return time.getTime() > Date.now()
         },
       },
+      appendixIdss: [],
       accessoryTFs: false,
     }
   },
@@ -610,10 +618,7 @@ export default {
       // this.selectedOptions = e
     },
     fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
+      if (row.addressUrl === null || row.addressUrl === '') {
         EventBus.$emit(
           'warning',
           this.$t('system.noticeCircular.NoInformation')
@@ -621,7 +626,7 @@ export default {
       } else {
         this.accessoryTFs = true
       }
-      this.appendixIdss = row.receiveAttachmentPath
+      this.appendixIdss = row.addressUrlArray
     },
     handleExamine(row) {
       this.$router.push({

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -89,7 +89,7 @@
             />
           </ws-form-item>
         </ws-info-table>
-        {{ age }}岁
+        <span v-if="age">{{ age }}岁</span>
       </div>
     </ws-form>
 
@@ -144,19 +144,22 @@
               prop="carLength"
               class="forlist"
             >
-              <ws-select
+              <el-select
                 v-model="item.carLength"
                 placeholder=""
                 class="typeselect"
                 @change="selectcarLength"
+                filterable
+                allow-create
+                default-first-option
               >
-                <ws-option
+                <el-option
                   v-for="item in carLengthList"
                   :key="item.constKey"
                   :label="item.constValue"
                   :value="item.constValue"
                 />
-              </ws-select>
+              </el-select>
             </ws-form-item>
             <!--载重-->
             <ws-form-item label="载重" span="1" prop="carLoad" class="forlist">
@@ -523,6 +526,7 @@ import { packList } from '@/model/contarct/index'
 import { getidentity, getbank, addDriver } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -551,13 +555,9 @@ export default {
       carModelList: [],
       carLengthList: [],
       options_: provinceAndCityData,
-      heightData: '600px',
-      zoom: 7,
       selectedOptions: [],
-      center: [116.244694, 39.517344],
       window: '',
       district: null,
-      listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
       mainReportAdd: {},
@@ -635,10 +635,6 @@ export default {
           this.carLengthList = response
         })
     },
-    confirmPositioncity() {
-      this.listDate.level = 'city'
-      this.listDate.country = this.name
-    },
     uploadSuccessHandle(index, e, fileList) {
       console.log(index, e, fileList)
       const that = this
@@ -775,10 +771,127 @@ export default {
     },
 
     submit() {
+      if (!this.deptBudgetList.driverName) {
+        EventBus.$emit('error', '司机姓名不能为空')
+        return
+      }
+      if (
+        this.deptBudgetList.driverName.length < 2 ||
+        this.deptBudgetList.driverName.length > 10
+      ) {
+        EventBus.$emit('error', '司机姓名输入错误')
+        return
+      }
+      if (!this.deptBudgetList.driverPhone) {
+        EventBus.$emit('error', '司机手机不能为空')
+        return
+      }
+      if (this.deptBudgetList.driverPhone.length != 11) {
+        console.log(this.deptBudgetList.driverPhone.length)
+        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', '车牌号不能为空')
+          return
+        }
+        if (this.freightspace[i].carNumber.length != 7) {
+          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
+        }
+      }
       var arr = []
       for (let key in this.addressUrls) {
+        console.log(this.addressUrls[key])
         arr.push(this.addressUrls[key])
       }
+
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
@@ -789,14 +902,35 @@ export default {
           this.deptBudgetList.addressUrl = arr.toString()
           this.deptBudgetList.driverCarInfoList = this.freightspace
           this.deptBudgetList.driverPayeeInfoList = this.freightspace1
-          console.log(this.deptBudgetList)
-          addDriver(this.deptBudgetList)
-            .toPromise()
-            .then((response) => {
-              this.$message.success('添加成功')
-              this.deptBudgetList = {}
-              this.$router.push({ path: 'tranManagementDriver' })
-            })
+          // addDriver(this.deptBudgetList)
+          //   .toPromise()
+          //   .then((response) => {
+          //     this.$message.success('添加成功')
+          //     this.deptBudgetList = {}
+          //     this.freightspace = [
+          //       {
+          //         carNumber: '',
+          //         carModel: '高栏',
+          //         carModelKey: '1',
+          //         carLength: '13',
+          //         carLengthKey: '1',
+          //         carLoad: '',
+          //         yearManufacture: '',
+          //       },
+          //     ]
+          //     this.freightspace1 = [
+          //       {
+          //         accountTypeFlag: '1',
+          //         payeeName: '',
+          //         payeeNumberCard: '',
+          //         compName: '',
+          //         bankDeposit: '',
+          //         addressUrlArray: [],
+          //         bankCard: '',
+          //       },
+          //     ]
+          //     this.$router.push({ path: 'tranManagementDriver' })
+          //   })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           return false

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -3,7 +3,7 @@
   <div class="container">
     <el-row>
       <el-col :span="12">
-        <h2 class="bg-left title">车次安排</h2>
+        <h2 class="bg-left title">汽运装车反馈</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button
@@ -92,16 +92,18 @@
       </ws-info-table>
       <div class="small-title">装车详情</div>
       <div class="liaison">
-        <ws-info-table>
-          <div
-            style="width: 100%"
-            class="flex position"
-            v-for="(item, index) in freightspace"
-          >
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+          <ws-info-table>
             <!--司机-->
-            <ws-form-item :label="'司机'+(index+1)" span="1" prop="driver">
-              <el-select
-                v-model="deptBudgetList.tranCarInfoList[0].driver"
+            <ws-form-item :label="'司机' + (index + 1)" span="1" prop="driver">
+               <el-select
+                v-show="item.temporaryDriverFlag != 0"
+                v-model="item.driver"
                 placeholder="请选择司机"
                 filterable
                 :filter-method="dataFilter"
@@ -113,51 +115,63 @@
                   :label="item.staffName"
                   :value="item.staffName"
                 />
-              </el-select>
+               
+              </el-select> 
+               <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span> 
+                   
             </ws-form-item>
             <!--电话-->
             <ws-form-item label="司机电话" span="1" prop="driverPhone">
-              <ws-input
-                v-model="deptBudgetList.driverPhone"
+               <ws-input
+               v-show="item.temporaryDriverFlag != 0"
+                v-model="item.driverPhone"
                 placeholder="请输入司机电话"
                 maxlength="20"
                 size="small"
-              />
+              /> 
+             <span v-show="item.temporaryDriverFlag == 0">{{item.driverPhone}} </span> 
             </ws-form-item>
             <!--车牌号-->
-            <ws-form-item label="车牌号" span="1" prop="sendDateStart">
+            <ws-form-item label="车牌号" span="1" prop="carNo">
                <ws-input
-                v-model="deptBudgetList.driverPhone"
-                placeholder="请输入司机电话"
+               v-show="item.temporaryDriverFlag != 0"
+                v-model="item.carNo"
+                placeholder="请输入车牌号"
                 maxlength="20"
                 size="small"
-              />
+              /> 
+             <span v-show="item.temporaryDriverFlag == 0">{{item.carNo}} </span> 
             </ws-form-item>
             <!--装车净重-->
-            <ws-form-item label="装车净重" span="1" prop="receiveDateEnd">
+            <ws-form-item label="装车净重" span="1" prop="loadNetWeight">
               <ws-input
-                v-model="deptBudgetList.driverPhone"
-                placeholder="请输入司机电话"
+                v-model="item.loadNetWeight"
+                placeholder="请输入装车净重"
                 maxlength="20"
                 size="small"
               />
             </ws-form-item>
-            <!--车型-->
-            <ws-form-item label="车型" span="1" prop="carModel">
-              <ws-select
-                v-model="deptBudgetList.carModel"
-                placeholder="请输入车型"
-                class="typeselect"
-              >
-                <ws-option
-                  v-for="item in carModel"
-                  :key="item.constKey"
-                  :label="item.constValue"
-                  :value="item.constValue"
+            <!--磅单-->
+            <ws-form-item label="磅单" span="1" prop="loadPoundImg">
+              <template slot-scope="scope">
+              
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian(scope.row)"
+                  alt=""
                 />
-              </ws-select>
+                <span v-show="item.temporaryDriverFlag == 0" >{{item.signStatus}}</span>
+              </template>
             </ws-form-item>
             <img
+            v-show="item.temporaryDriverFlag != 0"
               width="22"
               height="22"
               class="del"
@@ -165,11 +179,11 @@
               src="../../../public/img/del.png"
               alt=""
             />
-          </div>
-        </ws-info-table>
+          </ws-info-table>
+        </div>
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add"
-        >添加车厢</el-button
+        >添加临时用车</el-button
       >
     </ws-form>
     <!-- 提交 -->
@@ -182,11 +196,32 @@
         >提交</el-button
       >
     </div>
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>上传附件</p>
+      <ws-upload
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
+        :comp-id="compId"
+        :file-list="fileList"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.loadPoundImg"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+      />
+    </WinseaContentModal>
+
+
   </div>
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, dispatchCat, packList } from '@/model/transport/index'
+import { seeCat, packList, feedback } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -206,7 +241,6 @@ export default {
   },
   data() {
     return {
-      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
       },
@@ -223,7 +257,6 @@ export default {
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
-      tranType: 2,
       rules: {
         warehouseName: [
           {
@@ -239,22 +272,27 @@ export default {
           },
         ],
       },
-      appendixIdsAdd: '',
+       tranType: 1,
       size: 10,
       value1: '',
       unitList: [],
       freightspace: [
         {
-          trainNo: '',
+          driver: '',
+          driverPhone: '',
+          carNo: '',
+          loadNetWeight: '',
         },
       ],
       name: '',
-
       staffList: [],
       options: [],
       carModel: [],
       tranCarInfoList: {},
-      arr: [],
+      //上传
+      accessoryTFs:false,
+      fileList:[],
+        appendixIdsAdd: '',
     }
   },
   mounted() {
@@ -288,8 +326,11 @@ export default {
     },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
+        if (this.staffList[i].staffName == e) {     
           this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+         this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
+          // this.deptBudgetList.tranCarInfoList[i].driverPhone = this.staffList[i].staffMobilePhone
+          console.log(this.freightspace[i].driverPhone,"dianhu")
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -312,7 +353,10 @@ export default {
     },
     add() {
       this.freightspace.push({
-        trainNo: '',
+        driver: '',
+        driverPhone: '',
+        carNo: '',
+        loadNetWeight: '',
       })
     },
     del(index) {
@@ -329,7 +373,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = {}
       this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementTransporTationFire' })
+      this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -338,45 +382,48 @@ export default {
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
     },
+    handleClose() {
+      this.accessoryTFs = false
+    },
     submit() {
-      this.$confirm(`提交成功后，任务将下发给相关人员，是否确定提交?`, {
+      this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              for (var i = 0; i < this.freightspace.length; i++) {
-                var num = this.freightspace[i].trainNo
-                this.arr.push(num)
-              }
-              this.deptBudgetList.totalStorage = this.totalStorage
-
+             if (valid) {
+              // this.deptBudgetList.totalStorage = this.totalStorage
+              this.tranCarInfoList=this.freightspace    
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart =
-                this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd =
-                this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.carModel = this.deptBudgetList.carModel
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.boxNo = this.arr.toString()
-              var tranCarInfo = {}
-              var tranList = [this.tranCarInfoList]
-              tranCarInfo.id = this.deptBudgetList.id
-              tranCarInfo.infoId = this.deptBudgetList.infoId
-              tranCarInfo.tranCarInfoList = tranList
+              this.tranCarInfoList.carNo =this.deptBudgetList.carNo
+              this.tranCarInfoList.loadNetWeight =this.deptBudgetList.loadNetWeight
+             this.tranCarInfoList.tranType = this.tranType
+              this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+              // this.tranCarInfoList.boxNo = this.arr.toString()
+               for(var i = 0 ; i< this.tranCarInfoList.length ; i++){
+                 this.tranCarInfoList[i].id = this.freightspace[i].id
+                 if(this.tranCarInfoList[i].temporaryDriverFlag !=0){
+                   this.tranCarInfoList[i].temporaryDriverFlag = 1
+                   this.tranCarInfoList[i].tranType = this.tranType
+                 }
+              }
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.infoId = this.deptBudgetList.infoId
+              tranProcessInfo.tranCarInfoList = this.tranCarInfoList         
               // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-              dispatchCat(tranCarInfo)
+              feedback(tranProcessInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementTransporTationFire',
+                    path: 'tranManagementTransporHairRespond',
                   })
                 })
             } else {
@@ -397,6 +444,13 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.freightspace = response.tranCarInfoList
+          for (var i = 0; i < this.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
+            }
+          }
         })
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
@@ -452,35 +506,20 @@ export default {
         }
       }
     },
-    // 编辑
-    editClick(item, index) {
-      const map = JSON.parse(JSON.stringify(item))
-      if (Object.is(item.id, 1)) {
-        return
-      }
-      if (Object.is(this.unitList[index].flag, 'delete')) {
-        map.flag = 'check'
-        this.$set(this.unitList, index, map)
+    //上传
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
       } else {
-        map.flag = 'delete'
-        this.$set(this.unitList, index, map)
+        this.accessoryTFs = true
       }
-    },
-    // 删除
-    deleteClick(item, index) {
-      if (Object.is(item.constKey, 1)) {
-        return
-      }
-      if (!item.constValue) {
-        this.unitList.splice(index, 1)
-        return
-      }
-      delxiala({ id: this.unitList[index].id })
-        .toPromise()
-        .then((response) => {
-          this.getUnitList()
-          this.pleaseChoose = ''
-        })
+      this.appendixIdss = row.receiveAttachmentPath
     },
   },
 }

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,23 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button
-          class="but"
-          type="primary"
-          @click="handleAdd()"
-        >
+        <ws-button class="but" type="primary" @click="handleAdd()">
           执行中</ws-button
         >
-        <ws-button
-          class="but"
-          @click="handleLook()" 
-          >已完成</ws-button
-        >
-        <ws-button
-          class="but"
-          @click="handleEdit()"  
-          >全部任务</ws-button
-        >
+        <ws-button class="but" @click="handleLook()">已完成</ws-button>
+        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
@@ -44,10 +32,7 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
+        <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -77,22 +62,22 @@
         </el-table-column>
         <el-table-column prop="processNo" label="运输任务编号" width="120">
         </el-table-column>
-        <el-table-column prop="goodsName" label="运输方式" width="80">
+        <el-table-column prop="tranType" label="运输方式" width="80">
         </el-table-column>
-         <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="goodsName" label="货名" width="80">
         </el-table-column>
         <el-table-column prop="weight" label="重量（吨）" width="120">
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="160">
+        <el-table-column prop="send" label="发货" width="200">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="160">
+        <el-table-column prop="receive" label="收货" width="200">
         </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="feedbackStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -104,20 +89,27 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.feedbackStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.feedbackStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span
+                    v-if="scope.row.feedbackStatus == '已完成'"
+                    class="done"
+                  ></span
+                  >{{ scope.row.feedbackStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" class="flex">
+                <div
+                  v-for="(item, index) in historyList"
+                  class="flex"
+                  :key="index"
+                >
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -151,7 +143,11 @@
             <ws-button class="completed" @click="trainSee(scope.row)">
               查看
             </ws-button>
-            <ws-button class="putstorage" @click="feedback(scope.row)">
+            <ws-button
+              class="putstorage"
+              @click="feedback(scope.row)"
+              v-show="scope.row.tranType == '汽运'"
+            >
               反馈
             </ws-button>
           </template>
@@ -161,7 +157,7 @@
   </div>
 </template>
 <script>
-import { automobileList } from '@/model/transport/index'
+import { automobileList, state } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -255,29 +251,45 @@ export default {
     },
     //查看火运调度详细
     trainSee(row) {
-      this.$router.push({
-        
-      })
+      if (row.tranType == '汽运') {
+        this.$router.push({
+          path: 'tranManagementVehicleLook',
+          query: {
+            id: row.id,
+          },
+        })
+      }else if(row.tranType == '火运'){
+         this.$router.push({
+          path: 'tranManagementTransporTrainDetails',
+          query: {
+            id: row.id,
+          },
+        })
+      }else if(row.tranType == '船运'){
+        this.$router.push({
+          path: 'tranManagementShippingLook',
+          query: {
+            id: row.id,
+          },
+        })
+      }  
     },
     //反馈
     feedback(row) {
       this.$router.push({
         path: 'tranManagementTransporFeedback',
+        query: {
+          id: row.id,
+        },
       })
     },
 
     //已完成
-    handleLook() {
-      
-    },
+    handleLook() {},
     //待完成
-    handleAdd() {
-      
-    },
+    handleAdd() {},
     //全部任务
-    handleEdit() {
-      
-    },
+    handleEdit() {},
 
     dateFormat(fmt, date) {
       let ret
@@ -320,7 +332,6 @@ export default {
         contractType: this.contractType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
         .then((response) => {
@@ -341,7 +352,9 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editstatus({ id: row.id })
+          state({
+            id: row.id,
+          })
             .toPromise()
             .then((response) => {
               this.$notify.success({

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -67,9 +67,9 @@
         </el-table-column>
         <el-table-column prop="weight" label="重量（吨）" width="120">
         </el-table-column>
-        <el-table-column prop="send" label="发货" width="160">
+        <el-table-column prop="send" label="发货" width="200">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="160">
+        <el-table-column prop="receive" label="收货" width="200">
         </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
@@ -101,7 +101,7 @@
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" class="flex">
+                <div v-for="(item, index) in historyList" class="flex" :key="index">
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -255,7 +255,7 @@ export default {
       })
     },
 
-    //执行中
+    //待完成
     handleLook() {},
     //已完成
     handleAdd() {},

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -1,16 +1,16 @@
-// 查看派车详情
+//火运调度详情
 <template>
   <div class="container">
     <el-row>
-      <el-col :span="20">
-        <h2 class="bg-left title">查看派车详情</h2>
+      <el-col :span="12">
+        <h2 class="bg-left title">火运调度详情</h2>
       </el-col>
-      <el-col :span="4" class="bg-right">
+      <el-col :span="12" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
           size="small"
-          @click="revert()"
+          @click="returnsales()"
           ><img
             width="6"
             height="10"
@@ -22,75 +22,35 @@
       </el-col>
     </el-row>
 
-    <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
       <div class="small-title">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.processNo"
-            placeholder="请输入任务编号"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.processNo }}
         </ws-form-item>
         <!--货名-->
         <ws-form-item label="货名" span="1" prop="goodsName">
-          <!-- <el-select
-            v-model="deptBudgetList.goodsName"
-            placeholder="请选择货名"
-            filterable
-            :filter-method="dataFilter"
-            @change="selectstaff"
-          >
-            <el-option
-              v-for="item in personCharge"
-              :key="item.value"
-              :label="item.staffName"
-              :value="item.staffName"
-            /> -->
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.goodsName"
-            placeholder="请输入货名"
-            maxlength="20"
-            size="small"
-          />
-          <!-- </el-select> -->
+          {{ deptBudgetList.goodsName }}
         </ws-form-item>
         <!--重量（吨）-->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.weight"
-            placeholder="请输入重量（吨）"
-            maxlength="100"
-            size="small"
-          />
+          {{ deptBudgetList.weight }}
         </ws-form-item>
-
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-          <!-- <ws-input
-            v-model="deptBudgetList.sendDetailedAddress"
-            placeholder=""
-            maxlength="100"
-            size="small"
-          /> -->
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
 
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.sender"
-            placeholder="请输入发货人"
-            maxlength="100"
-            size="small"
-          />
+          {{ deptBudgetList.sender }}
         </ws-form-item>
 
         <!--发货人电话-->
@@ -100,322 +60,388 @@
           prop="senderPhone"
           class="readonly"
         >
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.senderPhone"
-            placeholder="请输入发货人电话"
-            maxlength="100"
-            size="small"
-          />
+          {{ deptBudgetList.senderPhone }}
         </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-          <!-- <ws-input
-            v-model="deptBudgetList.receiveDetailedAddress"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          /> -->
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
         <ws-form-item label="收货人" span="1" prop="receiver">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.receiver"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.receiver }}
         </ws-form-item>
         <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.receiverPhone"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.receiverPhone }}
         </ws-form-item>
         <!--发货日期-->
         <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.deliveryDateStart"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <!--最晚到货日期-->
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.deliveryDateEnd"
-            placeholder="请输入仓库名"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">
-          <ws-input
-            :disabled="disabled"
-            v-model="deptBudgetList.contractNo"
-            placeholder="请输入合同编号"
-            maxlength="20"
-            size="small"
-          />
+          {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title">派车</div>
-      <div
-        style="width: 100%"
-        class="driver"
-        v-for="(item, index) in deptBudgetList.tranCarInfoList"
-      >
+      <div class="small-title">联络员及车皮信息</div>
+      <div class="liaison" v-for="(item, index) in deptBudgetList.tranCarInfoList" :key="index">
         <ws-info-table>
-          <span class="not" v-if="item.statusFlag == 3">{{ item.status }}</span>
-          <span class="already" v-if="item.statusFlag == 1">{{
-            item.status
-          }}</span>
           <!--姓名-->
           <ws-form-item label="姓名" span="1" prop="driver">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.driver"
-              placeholder="请输入姓名"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item class="phone" label="电话" span="1" prop="driverPhone">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.driverPhone"
-              placeholder="请输入电话"
-              maxlength="20"
-              size="small"
-            />
+            {{ item.driver }}
           </ws-form-item>
-          <ws-form-item label="车牌号" span="1" prop="carNo">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.carNo"
-              placeholder="请输入车牌号"
-              maxlength="20"
-              size="small"
-            />
+          <!--电话-->
+          <ws-form-item label="电话" span="1" prop="driverPhone">
+            {{ item.driverPhone }}
           </ws-form-item>
-          <ws-form-item label="装车（吨）" span="1" prop="loadNetWeight">
-            <ws-input
-              :disabled="disabled"
-              v-model="deptBudgetList.loadNetWeight"
-              placeholder="未装车"
-              maxlength="20"
-              size="small"
-            />
+          <!--发车日期-->
+          <ws-form-item label="发车日期" span="1" prop="sendDateStart">
+            {{ item.sendDateStart }}
           </ws-form-item>
-          <ws-form-item label="卸车（吨）" span="1" prop="unloadNetWeight">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.unloadNetWeight"
-              placeholder="未卸车"
-              maxlength="20"
-              size="small"
-            />
+          <!--到站日期-->
+          <ws-form-item label="到站日期" span="1" prop="receiveDateEnd">
+            {{ item.receiveDateEnd }}
           </ws-form-item>
-          <ws-form-item label="损耗（吨）" span="1" prop="loss">
-            <ws-input
-              :disabled="disabled"
-              v-model="item.loss"
-              placeholder="未损耗"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
-          <ws-form-item label="合同" span="1" prop="unloadNetWeight">
+          <!--车型-->
+          <ws-form-item label="车型" span="1" prop="carModel">
+            {{item.carModel }}
           </ws-form-item>
         </ws-info-table>
+        <ws-info-table>
+          <div
+            style="width: 100%"
+            class="flex position"
+            v-for="(items, index) in freightspace"
+            :key="index"
+          >
+            <!--车厢号-->
+            <ws-form-item
+              :label="'车厢号-' + (index + 1)"
+              span="1"
+              prop="trainNo"
+            >
+              {{ items.trainNo }}
+            </ws-form-item>
+          </div>
+        </ws-info-table>
       </div>
     </ws-form>
-    <div style="text-align: right; padding: 10px">
+
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
       <el-button
-        class="bg-bottom-up"
+        class="bg-bottom"
         type="primary"
         size="small"
-        @click="revert()"
+        @click="returnsales()"
         >关闭</el-button
       >
     </div>
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
-import Pagination from '@/components/Pagination'
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, dispatchCat, packList } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
-import { seeCat } from '@/model/transport/index'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
+import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    mapDrag,
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
+    vesselId(val) {
+      this.getVesselData()
+    },
     isShow(val) {
       this.showType = val
     },
   },
   data() {
     return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      disabled: true,
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      goodnameList: {},
-      // 提交类型
-      submitType: true,
-      storageType: [],
-      readonly: true,
-      appendixIdsAdd: '',
-      uploadSuccess: {},
-      onChange: {},
-      gradeList: [],
+      staffList: [],
+      deptBudgetList: {
+        totalStorage: 0,
+        tranCarInfoList: [],
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      tranType: 2,
       rules: {
-        netWeight: [
+        warehouseName: [
           {
             required: true,
-            type: 'number',
-            message: '请输入活动名称',
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
             trigger: 'blur',
           },
         ],
       },
+      appendixIdsAdd: '',
       size: 10,
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      deptBudgetList: {
-        warehouseInOutDetail: {},
-      },
-      historyList: [],
-
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
-      accessoryTFs: false,
+      value1: '',
+      unitList: [],
+      freightspace: [
+        // {
+        //   trainNo: '',
+        // },
+      ],
+      name: '',
+      list: [],
+      staffList: [],
+      options: [],
+      carModel: [],
+      tranCarInfoList: {},
+      arr: [],
     }
   },
-  activated() {
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+  },
   methods: {
-    //返回按钮
-    revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
     },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
       }
     },
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    //下拉司机姓名改变事件
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementTransporTationFire' })
+    },
+    // confirmPosition() {
+    //   this.draggable = false
+    // },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+
     getList() {
-      seeCat({ id: this.$route.query.id })
+      seeCat({ id: this.deptBudgetList.id })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.tranCarInfoList.length; i++) {
-            if (
-              response.tranCarInfoList[i].loadNetWeight &&
-              response.tranCarInfoList[i].unloadNetWeight
-            ) {
-              response.tranCarInfoList[i].loss =
-                response.tranCarInfoList[i].loadNetWeight -
-                response.tranCarInfoList[i].unloadNetWeight
-            } else if (response.tranCarInfoList[i].loadNetWeight) {
-              response.tranCarInfoList[i].loss =
-                response.tranCarInfoList[i].loadNetWeight
-            } else {
-              response.tranCarInfoList[i].loss = 0
+          this.deptBudgetList = response
+          this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          if (response.tranCarInfoList[0].boxNo) {
+            this.list = response.tranCarInfoList[0].boxNo.split(',')
+            for (var i = 0; i < this.list.length; i++) {
+              var num = this.list[i]
+              this.freightspace.push({
+                trainNo: num,
+              })
             }
           }
-          this.deptBudgetList = response
         })
     },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    // handleCloe() {
-    //   this.dialogViewSpareMoney = false
-    // },
-    // history(row) {
-    //   billoperatehis({ id: row.id })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.historyList = response
-    //     })
-    // },
-    // deletecontract(){},
-    //删除
+    handleExamine() {},
     approve() {},
-    listQuery() {},
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    // 编辑
+    editClick(item, index) {
+      const map = JSON.parse(JSON.stringify(item))
+      if (Object.is(item.id, 1)) {
+        return
+      }
+      if (Object.is(this.unitList[index].flag, 'delete')) {
+        map.flag = 'check'
+        this.$set(this.unitList, index, map)
+      } else {
+        map.flag = 'delete'
+        this.$set(this.unitList, index, map)
+      }
+    },
+    // 删除
+    deleteClick(item, index) {
+      if (Object.is(item.constKey, 1)) {
+        return
+      }
+      if (!item.constValue) {
+        this.unitList.splice(index, 1)
+        return
+      }
+      delxiala({ id: this.unitList[index].id })
+        .toPromise()
+        .then((response) => {
+          this.getUnitList()
+          this.pleaseChoose = ''
+        })
+    },
   },
 }
 </script>
+
 <style lang="scss" scoped>
-/deep/.basicInformation {
-  .ws-info-table {
-    border: none;
-  }
-  .el-form-item {
-    width: 33.3333%;
-    border: none;
-    .el-form-item__label {
-      background: transparent;
-      border: none;
-    }
-    .el-form-item__content {
-      border: none;
-    }
-  }
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+
+.del {
+  position: absolute;
+  right: -38px;
+  top: 9px;
+  cursor: pointer;
+}
+.del {
+  right: 0;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
 }
 .title {
   position: relative;
-  padding-left: 10px;
 }
 .title::before {
   content: '';
@@ -426,9 +452,6 @@ export default {
   position: absolute;
   left: 0;
 }
-.el-form {
-  padding: 0 10%;
-}
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;
@@ -436,95 +459,191 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
 .bg-right {
+  padding-right: 10px;
   text-align: right;
-  padding: 16px 20px;
 }
-.center {
-  position: relative;
-  top: 50px;
-  width: 40%;
-  height: 2000px;
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
   margin: 0 auto;
 }
-/deep/.ws-info-table .el-form-item {
-  width: 33.33%;
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
 }
-/deep/.el-form-item__label {
-  width: 160px;
+.wenzi p {
+  display: inline-block;
 }
-//选填
-/deep/.el-form-item {
-  width: 50%;
+.center {
+  width: 900px;
+  margin: 0 auto;
 }
-.container {
-  overflow: scroll;
-  height: 120vh;
+.el-form-item {
+  width: 50%;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
+.el-form-item__label {
   text-align: center;
 }
-.deliverydate {
-  display: inline-block;
-  width: 10%;
+.ce {
+  width: 900px;
+  margin: 0 auto;
 }
-.center {
-  margin-top: -60px;
-  width: 80%;
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
 }
-//仓位
 
-.position {
-  border-radius: 2px;
-  font-size: 12px;
-  line-height: 20px;
-  display: inline-grid;
-  padding: 2px 4px;
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
 }
-//表格文字
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: left;
-  font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #000;
-  line-height: 16px;
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
 }
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
+.winseaview-view {
+  padding: 0 0 20px;
 }
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-  padding: 4px 2px;
+.container {
+  overflow: scroll;
+  height: 93vh;
 }
-// 下面列表
-.neifor {
-  width: 90%;
-  background-color: #f6f7fc;
+.ws-info-table .el-form-item {
+  width: 33.3333%;
 }
-/deep/.neifor .ws-info-table .el-form-item .el-form-item__label {
-  width: 35%;
-  text-align: center;
+.readonly:after {
+  display: none;
 }
-
-/deep/.neifor .el-input--small .el-input__inner {
-  width: 100%;
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
 }
-// .ws-info-table[data-v-850a44a6] .el-form-item {
-//     width: 16.66%;
-// }
-.xia {
+.readonly {
   width: 16%;
 }
+
 //去边框
 /deep/.el-form-item {
   border-right: 0px;
@@ -546,23 +665,43 @@ export default {
   border-left: 0px;
   border-top: 0px;
 }
-.driver {
-  position: relative;
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
-.not,
-.already {
-  position: absolute;
-  left: -45px;
-  top: 10px;
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 
-/deep/.driver .ws-info-table .el-form-item {
-  width: 14%;
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+}
+//联络员及车次
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 20%;
 }
-/deep/.driver .ws-info-table .el-form-item .el-form-item__label {
-  width: 86px;
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 25%;
 }
-/deep/.driver .ws-info-table .el-form-item.phone .el-form-item__label {
-  width: 50px;
+/deep/.liaison .flex {
+  display: contents;
 }
-</style>
+</style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -32,156 +32,163 @@
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
-          {{deptBudgetList.processNo}}
+          {{ deptBudgetList.processNo }}
         </ws-form-item>
         <!--货名-->
         <ws-form-item label="货名" span="1" prop="goodsName">
-            {{deptBudgetList.goodsName}}
+          {{ deptBudgetList.goodsName }}
         </ws-form-item>
         <!--重量（吨）-->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
-          {{deptBudgetList.weight}}
+          {{ deptBudgetList.weight }}
         </ws-form-item>
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-           {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
 
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          {{deptBudgetList.sender}}
+          {{ deptBudgetList.sender }}
         </ws-form-item>
 
         <!--发货人电话-->
-        <ws-form-item label="发货人电话" span="1"  prop="senderPhone" class="readonly">
-          {{deptBudgetList.senderPhone}}
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          {{ deptBudgetList.senderPhone }}
         </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-           {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
         <ws-form-item label="收货人" span="1" prop="receiver">
-          {{deptBudgetList.receiver}}
+          {{ deptBudgetList.receiver }}
         </ws-form-item>
         <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          {{deptBudgetList.receiverPhone}}
+          {{ deptBudgetList.receiverPhone }}
         </ws-form-item>
         <!--发货日期-->
         <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          {{deptBudgetList.deliveryDateStart}}
+          {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
         <!--最晚到货日期-->
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          {{deptBudgetList.deliveryDateEnd}}
+          {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{deptBudgetList.contractNo}}
+          {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
       <div class="small-title">联络员及车皮信息</div>
-     <div class="liaison">
-      <ws-info-table >
-        <!--姓名-->
-        <ws-form-item label="姓名" span="1" prop="driver">
-          <el-select
-            v-model="this.deptBudgetList.tranCarInfoList[0].driver"
-            placeholder="请选择姓名"
-            filterable
-            :filter-method="dataFilter"
-            @change="selectstaff"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.staffName"
-              :value="item.staffName"
-            />
-          </el-select>
-        
-        </ws-form-item>
-        <!--电话-->
-        <ws-form-item label="电话" span="1" prop="driverPhone">
-          <ws-input
-            v-model="this.deptBudgetList.tranCarInfoList[0].driverPhone"
-            placeholder="请输入电话"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
-        <!--发车日期-->
-        <ws-form-item label="发车日期" span="1" prop="sendDateStart">
-          <ws-date-picker
-            v-model="this.deptBudgetList.tranCarInfoList[0].sendDateStart"
-            type="date"
-            placeholder="请选择发货日期"
-            value-format="yyyy-MM-dd"
-          />
-        </ws-form-item>
-        <!--到站日期-->
-        <ws-form-item label="到站日期" span="1" prop="receiveDateEnd">
-          <ws-date-picker
-            v-model="this.deptBudgetList.tranCarInfoList[0].receiveDateEnd"
-            type="date"
-            placeholder="请选择发货日期"
-            value-format="yyyy-MM-dd"
-          />
-        </ws-form-item>
-        <!--车型-->
-        <ws-form-item label="车型" span="1" prop="carModel">
-          <ws-select
-            v-model="this.deptBudgetList.tranCarInfoList[0].carModel"
-            placeholder="请输入车型"
-            class="typeselect"
-          >
-            <ws-option
-              v-for="item in carModel"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            />
-          </ws-select>
-        </ws-form-item>
-      </ws-info-table>
-      <ws-info-table>
-        <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in freightspace"
-        >
-          <!--车厢号-->
-          <ws-form-item
-            :label="'车厢号-' + (index + 1)"
-            span="1"
-            prop="trainNo"
-          >
+      <div
+        class="liaison"
+        v-for ="(item, index) in deptBudgetList.tranCarInfoList"
+        :key="index"
+      >
+        <ws-info-table>
+          <!--姓名-->
+          <ws-form-item label="姓名" span="1" prop="driver">
+            <el-select
+              v-model="item.driver"
+              placeholder="请选择姓名"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </ws-form-item>
+          <!--电话-->
+          <ws-form-item label="电话" span="1" prop="driverPhone">
             <ws-input
-              v-model="item.trainNo"
-              placeholder="请输入车厢号"
+              v-model="item.driverPhone"
+              placeholder="请输入电话"
               maxlength="20"
               size="small"
             />
-            <img
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt=""
+          </ws-form-item>
+          <!--发车日期-->
+          <ws-form-item label="发车日期" span="1" prop="sendDateStart">
+            <ws-date-picker
+              v-model="item.sendDateStart"
+              type="date"
+              placeholder="请选择发货日期"
+              value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-        </div>
-      </ws-info-table>
-     </div>
-       <el-button
-          class="add bg-bottom"
-          type="primary"
-          size="small"
-          @click="add"
-          >添加车厢</el-button
-        >
+          <!--到站日期-->
+          <ws-form-item label="到站日期" span="1" prop="receiveDateEnd">
+            <ws-date-picker
+              v-model="item.receiveDateEnd"
+              type="date"
+              placeholder="请选择到站日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
+          <!--车型-->
+          <ws-form-item label="车型" span="1" prop="carModel">
+            <ws-select
+              v-model="item.carModel"
+              placeholder="请输入车型"
+              class="typeselect"
+            >
+              <ws-option
+                v-for="items in carModel"
+                :key="items.constKey"
+                :label="items.constValue"
+                :value="items.constValue"
+              />
+            </ws-select>
+          </ws-form-item>
+        </ws-info-table>
+        <ws-info-table>
+          <div
+            style="width: 100%"
+            class="flex position"
+            v-for="(item1, index) in freightspace"
+            :key="index"
+          >
+            <!--车厢号-->
+            <ws-form-item
+              :label="'车厢号-' + (index + 1)"
+              span="1"
+              prop="boxNo"
+            >
+              <ws-input
+                v-model="item1.trainNo"
+                placeholder="请输入车厢号"
+                maxlength="20"
+                size="small"
+              />
+              <img
+                width="22"
+                height="22"
+                class="del"
+                @click="del(index)"
+                src="../../../public/img/del.png"
+                alt=""
+              />
+            </ws-form-item>
+          </div>
+        </ws-info-table>
+      </div>
+      <el-button class="add bg-bottom" type="primary" size="small" @click="add"
+        >添加车厢</el-button
+      >
     </ws-form>
 
     <!-- 提交 -->
@@ -256,9 +263,9 @@ export default {
       value1: '',
       unitList: [],
       freightspace: [
-        {
-          trainNo: '',
-        },
+        // {
+        //   trainNo: '',
+        // },
       ],
       name: '',
       list: [],
@@ -266,7 +273,7 @@ export default {
       options: [],
       carModel: [],
       tranCarInfoList: {},
-      arr:[],
+      arr: [],
     }
   },
   mounted() {
@@ -301,7 +308,8 @@ export default {
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+           this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+             this.deptBudgetList.tranCarInfoList[0].driverPhone = this.staffList[i].staffMobilePhone
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -361,19 +369,20 @@ export default {
             if (valid) {
               for (var i = 0; i < this.freightspace.length; i++) {
                 var num = this.freightspace[i].trainNo
-                this.arr.push(
-                  num  
-                )
+                this.arr.push(num)
               }
-              console.log(this.tranCarInfoList.boxNo = this.arr.toString())
               this.deptBudgetList.totalStorage = this.totalStorage
 
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart = this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
+              this.tranCarInfoList.sendDateStart =
+                this.deptBudgetList.sendDateStart
+              this.tranCarInfoList.receiveDateEnd =
+                this.deptBudgetList.receiveDateEnd
               this.tranCarInfoList.carModel = this.deptBudgetList.carModel
-              this.tranCarInfoList.tranType= this.tranType
+              this.tranCarInfoList.id =
+                this.deptBudgetList.tranCarInfoList[0].id
+              this.tranCarInfoList.tranType = this.tranType
               this.tranCarInfoList.boxNo = this.arr.toString()
               var tranCarInfo = {}
               var tranList = [this.tranCarInfoList]
@@ -411,6 +420,15 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          if (response.tranCarInfoList[0].boxNo) {
+            this.list = response.tranCarInfoList[0].boxNo.split(',')
+            for (var i = 0; i < this.list.length; i++) {
+              var num = this.list[i]
+              this.freightspace.push({
+                trainNo: num,
+              })
+            }
+          }
         })
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
@@ -418,6 +436,7 @@ export default {
         .then((response) => {
           this.options = response
           this.staffList = response
+          //  this.deptBudgetList.tranCarInfoList.driverPhone = response
         })
       //车型
       packList({ constId: 'TRAN5' })
@@ -807,7 +826,7 @@ export default {
   border-radius: 4px;
   border: 1px solid #d8dce6;
 }
-/deep/.flex .ws-info-table .el-form-item .el-form-item__content{
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
 //联络员及车次
@@ -815,11 +834,9 @@ export default {
   width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-
   width: 25%;
 }
-/deep/.liaison .flex{
+/deep/.liaison .flex {
   display: contents;
 }
-
 </style>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -160,7 +160,8 @@
                 prop="driverName"
                 class="siji"
               >
-                <ws-select
+                <el-select
+                  :disabled="item.disabled"
                   v-model="item.driver"
                   placeholder="请选择司机"
                   class="typeselect"
@@ -170,13 +171,13 @@
                     }
                   "
                 >
-                  <ws-option
+                  <el-option
                     v-for="(items, index) in carList"
                     :key="index"
                     :label="items.driverName"
                     :value="items.driverName"
                   />
-                </ws-select>
+                </el-select>
               </ws-form-item>
               <!--司机电话-->
               <ws-form-item
@@ -185,7 +186,8 @@
                 prop="impurity"
                 class="siji"
               >
-                <ws-select
+                <el-select
+                  :disabled="item.disabled"
                   v-model="item.driverPhone"
                   placeholder="请选择司机"
                   class="typeselect"
@@ -195,13 +197,13 @@
                     }
                   "
                 >
-                  <ws-option
+                  <el-option
                     v-for="(items, index) in carList"
                     :key="index"
                     :label="items.driverPhone"
                     :value="items.driverPhone"
                   />
-                </ws-select>
+                </el-select>
               </ws-form-item>
               <!--车牌号-->
               <ws-form-item label="车牌号" span="1" prop="carNo" class="siji">
@@ -383,6 +385,7 @@ export default {
         carModel: '',
         carModelKey: '',
         carNumber: '',
+        disabled: false,
         tranType: '1',
       })
     },
@@ -426,7 +429,15 @@ export default {
       seeCat({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
+          if (response.tranCarInfoList.length > 0) {
+            for (var i = 0; i < response.tranCarInfoList.length; i++) {
+              if (response.tranCarInfoList[i].id) {
+                response.tranCarInfoList[i].disabled = true
+              }
+            }
+          }
           this.deptBudgetList = response
+          console.log(this.deptBudgetList)
           if (this.deptBudgetList.tranCarInfoList.length == 0) {
             this.deptBudgetList.tranCarInfoList = [
               {
@@ -438,6 +449,7 @@ export default {
                 carModel: '',
                 carModelKey: '',
                 carNumber: '',
+                disabled: false,
                 tranType: '1',
               },
             ]

vue.config.js

@@ -144,7 +144,11 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
+<<<<<<< HEAD
         target: 'http://192.168.1.119:8090/',
+=======
+        target: 'http://192.168.1.115:8090/',
+>>>>>>> 1a7d14cecab5839e5000721674fca3ad16597dae
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',