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

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -175,7 +175,7 @@
           </el-table-column>
           <el-table-column prop="transportLoss" label="累计运输损耗（吨）">
             <template scope="scope">
-              {{ scope.row.weightOut - scope.row.weightIn }}
+              {{ scope.row.weightOut - scope.row.weightIn - Number(count)}}
             </template>
           </el-table-column>
         </el-table>

src/views/taskManagement/tranManagementLook.vue

@@ -136,8 +136,7 @@
           <!--发货人电话-->
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
             {{ item.receiverPhone }}
-          </ws-form-item>
-           
+          </ws-form-item>       
         </ws-info-table>
         <!-- </div> -->
       </div>

src/views/taskManagement/tranManagementTransport.vue

@@ -165,7 +165,7 @@
           "
             >编辑</div>
             <div
-              class="record"
+              class="record1"
               @click="deleteclick(scope.row)"
               v-hasPermission="
            `transportationTask.transportation.transportationInfo.delete`
@@ -517,12 +517,13 @@ export default {
   border-left: 1px solid #e9ecf7;
 }
 .record,
-.adjustment {
+.adjustment,.record1 {
   display: inline-block;
   color: #5878e8;
   padding: 0 4px !important;
   position: relative;
 }
+
 .record:after {
   position: absolute;
   content: '';

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -6,7 +6,12 @@
         <h2 class="bg-left title">创建运输任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+        >
           <img
             width="6"
             height="10"
@@ -17,7 +22,11 @@
         </el-button>
       </el-col>
     </el-row>
-    <el-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+    <el-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
       <ws-info-table class="el-table">
         <el-form-item label="任务编号" span="1" prop="taskNo" class="forlist">
           <el-input
@@ -70,32 +79,29 @@
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
           <el-input
-          @input='weightchange'
+            @input="weightchange"
             v-model="deptBudgetList.weight"
             placeholder="请输入重量"
             maxlength="20"
             size="small"
           ></el-input>
-
         </el-form-item>
       </ws-info-table>
       <ws-info-table class="el-table">
-        <div class="start-address" style="width : 36%">
-          <el-radio-group @change='warehouseTypechange' v-model="deptBudgetList.warehouseType">
-          <el-radio label="1"
-            >常用仓库发货</el-radio
-          >
-          <el-radio label="2"
-            >临时仓库发货</el-radio
+        <div class="start-address" style="width: 36%">
+          <el-radio-group
+            @change="warehouseTypechange"
+            v-model="deptBudgetList.warehouseType"
           >
+            <el-radio label="1">常用仓库发货</el-radio>
+            <el-radio label="2">临时仓库发货</el-radio>
           </el-radio-group>
           <el-select
-          @change='sendWarehousechange'
+            @change="sendWarehousechange"
             v-model="deptBudgetList.sendWarehouse"
             placeholder="选择仓库"
             class="typeselect"
           >
-
             <el-option
               v-for="item in warehouseList"
               :key="item.constKey"
@@ -118,7 +124,7 @@
           label="始发地详细地址"
           span="1"
           prop="startDetailedAddress"
-         style="width:31.333%"
+          style="width: 31.333%"
         >
           <el-input
             v-model="deptBudgetList.startDetailedAddress"
@@ -135,7 +141,7 @@
           style="width: 36%"
         >
           <el-select
-          @change='sendWarehousechange1'
+            @change="sendWarehousechange1"
             v-model="deptBudgetList.receiveWarehouse"
             :disabled="warehouse"
             placeholder="请输入收货库点"
@@ -149,7 +155,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="终到地" span="1" prop="contractNo" class="start-address">
+        <el-form-item
+          label="终到地"
+          span="1"
+          prop="contractNo"
+          class="start-address"
+        >
           <el-cascader
             :options="options_"
             v-model="selectedOptions1"
@@ -191,7 +202,7 @@
         <div class="driver">
           <span>运输阶段{{ index + 1 }} {{ item.processNo }}</span>
           <img
-          v-if='!endflag'
+            v-if="!endflag "
             width="22"
             height="22"
             class="add"
@@ -212,12 +223,13 @@
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
           >最终阶段</span> -->
           <el-checkbox
-          @change='engflagchange'
-           class='endflag'
+            @change="engflagchange"
+            class="endflag"
             v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
-          >最终阶段</el-checkbox>
+            >最终阶段</el-checkbox
+          >
         </div>
         <ws-info-table>
           <el-form-item label="运输方式" span="1" prop="waterContent">
@@ -255,8 +267,16 @@
             />
           </el-form-item>
           <!-- 本阶段重量 -->
-          <el-form-item label="本阶段运输重量（吨）" span="1" prop="bulkDensity">
-            <el-input v-model="item.weight" placeholder="请输入本阶段运输重量" size="small"></el-input>
+          <el-form-item
+            label="本阶段运输重量（吨）"
+            span="1"
+            prop="bulkDensity"
+          >
+            <el-input
+              v-model="item.weight"
+              placeholder="请输入本阶段运输重量"
+              size="small"
+            ></el-input>
           </el-form-item>
         </ws-info-table>
         <ws-info-table>
@@ -284,10 +304,20 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="发货人" span="1" prop="bulkDensity">
-            <el-input v-model="item.sender" placeholder="请输入发货人" maxlength="20" size="small"></el-input>
+            <el-input
+              v-model="item.sender"
+              placeholder="请输入发货人"
+              maxlength="20"
+              size="small"
+            ></el-input>
           </el-form-item>
           <el-form-item label="发货人电话" span="1" prop="bulkDensity">
-            <el-input v-model="item.senderPhone" placeholder="请输入发货人电话" maxlength="20" size="small"></el-input>
+            <el-input
+              v-model="item.senderPhone"
+              placeholder="请输入发货人电话"
+              maxlength="20"
+              size="small"
+            ></el-input>
           </el-form-item>
         </ws-info-table>
         <ws-info-table>
@@ -315,7 +345,12 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="收货人" span="1" prop="bulkDensity">
-            <el-input v-model="item.receiver" placeholder="请输入收货人" maxlength="20" size="small"></el-input>
+            <el-input
+              v-model="item.receiver"
+              placeholder="请输入收货人"
+              maxlength="20"
+              size="small"
+            ></el-input>
           </el-form-item>
           <el-form-item label="收货人电话" span="1" prop="bulkDensity">
             <el-input
@@ -330,7 +365,13 @@
     </el-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
     </div>
   </div>
 </template>
@@ -344,7 +385,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag
+    mapDrag,
   },
   watch: {
     vesselId(val) {
@@ -352,12 +393,12 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     let self = this
     return {
-      flag:2,
+      flag: 2,
       checkList: [],
       deptBudgetList: {
         taskNo: '',
@@ -367,7 +408,7 @@ export default {
         warehouseType: '1',
         tranProcessInfoList: [
           {
-            sort:0,
+            sort: 0,
             processNo: '',
             tranType: '汽运',
             tranTypeKey: '1',
@@ -388,15 +429,15 @@ export default {
             receiver: '',
             senderPhone: '',
             receiverPhone: '',
-            endFlag: '0'
-          }
-        ]
+            endFlag: '0',
+          },
+        ],
       },
       radio: '1',
       options_: regionData,
       heightData: '600px',
       zoom: 7,
-      endflag:false,
+      endflag: false,
       selectedOptions: [],
       selectedOptions1: [],
       window: '',
@@ -417,7 +458,7 @@ export default {
       unitList: [],
       name: '',
       age: '',
-      number:2,
+      number: 2,
     }
   },
   activated() {
@@ -425,7 +466,7 @@ export default {
     this.showType = this.isShow
   },
   computed: {
-    warehouse: function() {
+    warehouse: function () {
       if (
         this.deptBudgetList.taskType == '销售出库' ||
         this.deptBudgetList.taskType == '贸易服务出库' ||
@@ -435,37 +476,61 @@ export default {
       } else {
         return false
       }
-    }
+    },
   },
   methods: {
-    sendWarehousechange(e){
+    sendWarehousechange(e) {
       for (let i = 0; i < this.warehouseList.length; i++) {
-        if(this.warehouseList[i].warehouseName==e){
-          var tmp=[]
-          tmp[0]=TextToCode[this.warehouseList[i].warehousePrivate].code
-          tmp[1]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity].code
-          tmp[2]=TextToCode[this.warehouseList[i].warehousePrivate][this.warehouseList[i].warehouseCity][this.warehouseList[i].warehouseArea].code
-          this.selectedOptions=tmp
-          this.deptBudgetList.tranProcessInfoList[0].selectedOptions=tmp
-          this.$set(this.deptBudgetList,'startDetailedAddress',this.warehouseList[i].detailedAddress)
-          this.$set(this.deptBudgetList.tranProcessInfoList[0],'sendDetailedAddress',this.deptBudgetList.startDetailedAddress)
+        if (this.warehouseList[i].warehouseName == e) {
+          var tmp = []
+          tmp[0] = TextToCode[this.warehouseList[i].warehousePrivate].code
+          tmp[1] =
+            TextToCode[this.warehouseList[i].warehousePrivate][
+              this.warehouseList[i].warehouseCity
+            ].code
+          tmp[2] =
+            TextToCode[this.warehouseList[i].warehousePrivate][
+              this.warehouseList[i].warehouseCity
+            ][this.warehouseList[i].warehouseArea].code
+          this.selectedOptions = tmp
+          this.deptBudgetList.tranProcessInfoList[0].selectedOptions = tmp
+          this.$set(
+            this.deptBudgetList,
+            'startDetailedAddress',
+            this.warehouseList[i].detailedAddress
+          )
+          this.$set(
+            this.deptBudgetList.tranProcessInfoList[0],
+            'sendDetailedAddress',
+            this.deptBudgetList.startDetailedAddress
+          )
         }
       }
     },
-    sendWarehousechange1(e){
+    sendWarehousechange1(e) {
       for (let i = 0; i < this.warehouseList1.length; i++) {
-        if(this.warehouseList1[i].warehouseName==e){
-          var tmp=[]
-          tmp[0]=TextToCode[this.warehouseList1[i].warehousePrivate].code
-          tmp[1]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity].code
-          tmp[2]=TextToCode[this.warehouseList1[i].warehousePrivate][this.warehouseList1[i].warehouseCity][this.warehouseList1[i].warehouseArea].code
-          this.selectedOptions1=tmp
-          this.$set(this.deptBudgetList,'endDetailedAddress',this.warehouseList1[i].detailedAddress)
+        if (this.warehouseList1[i].warehouseName == e) {
+          var tmp = []
+          tmp[0] = TextToCode[this.warehouseList1[i].warehousePrivate].code
+          tmp[1] =
+            TextToCode[this.warehouseList1[i].warehousePrivate][
+              this.warehouseList1[i].warehouseCity
+            ].code
+          tmp[2] =
+            TextToCode[this.warehouseList1[i].warehousePrivate][
+              this.warehouseList1[i].warehouseCity
+            ][this.warehouseList1[i].warehouseArea].code
+          this.selectedOptions1 = tmp
+          this.$set(
+            this.deptBudgetList,
+            'endDetailedAddress',
+            this.warehouseList1[i].detailedAddress
+          )
         }
       }
     },
-    warehouseTypechange(){
-        getwarehousename({
+    warehouseTypechange() {
+      getwarehousename({
         compId: this.compId,
         warehouseType: this.deptBudgetList.warehouseType,
       })
@@ -474,17 +539,25 @@ export default {
           this.warehouseList = response
         })
     },
-    weightchange(e){
-      this.deptBudgetList.tranProcessInfoList[0].weight=e
+    weightchange(e) {
+      this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
-    engflagchange(e){
-      this.endflag=e
-      if(this.endflag){
-        this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].selectedOptions1 = this.selectedOptions1
-        this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
-      }else{
-         this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].selectedOptions1 = []
-         this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length - 1].receiveDetailedAddress = ''
+    engflagchange(e) {
+      this.endflag = e
+      if (this.endflag) {
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].selectedOptions1 = this.selectedOptions1
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
+      } else {
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].selectedOptions1 = []
+        this.deptBudgetList.tranProcessInfoList[
+          this.deptBudgetList.tranProcessInfoList.length - 1
+        ].receiveDetailedAddress = ''
       }
     },
     // 获取当前年月日
@@ -509,7 +582,7 @@ export default {
         if (i > 90 && i < 97) continue
         arr.push(String.fromCharCode(i))
       }
-      arr.sort(function() {
+      arr.sort(function () {
         return Math.random() - 0.5
       })
       arr.length = 4
@@ -518,47 +591,48 @@ export default {
     },
     loaddata() {
       this.deptBudgetList.taskNo = 'YS' + this.getdate() + this.verifyinit()
-      this.deptBudgetList.tranProcessInfoList[0].processNo=this.deptBudgetList.taskNo+'-1'
+      this.deptBudgetList.tranProcessInfoList[0].processNo =
+        this.deptBudgetList.taskNo + '-1'
       // 货名
       packList({ constId: 'CON2' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.goodnameList = response
         })
       // 任务类型
       packList({ constId: 'TRAN3' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.taskType = response
         })
       // 运输方式
       packList({ constId: 'TRAN6' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.taskwayList = response
         })
 
       getwarehousename({
         compId: this.compId,
-        warehouseType: this.deptBudgetList.warehouseType
+        warehouseType: this.deptBudgetList.warehouseType,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseList = response
         })
-        getwarehousename({
+      getwarehousename({
         compId: this.compId,
-        warehouseType: 1
+        warehouseType: 1,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseList1 = response
         })
       xialaNo({
-        compId: this.compId
+        compId: this.compId,
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.contractNoList = response
         })
     },
@@ -572,12 +646,15 @@ export default {
     },
     add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
-        processNo: this.deptBudgetList.taskNo+'-'+(this.number),
+        processNo: this.deptBudgetList.taskNo + '-' + this.number,
         tranType: '汽运',
         tranTypeKey: '1',
         deliveryDateStart: '',
         deliveryDateEnd: '',
-        weight: this.deptBudgetList.tranProcessInfoList[this.deptBudgetList.tranProcessInfoList.length-1].weight,
+        weight:
+          this.deptBudgetList.tranProcessInfoList[
+            this.deptBudgetList.tranProcessInfoList.length - 1
+          ].weight,
         selectedOptions: [],
         selectedOptions1: [],
         sendPrivate: '',
@@ -592,7 +669,7 @@ export default {
         receiver: '',
         senderPhone: '',
         receiverPhone: '',
-        endFlag: '0'
+        endFlag: '0',
       })
       this.number++
     },
@@ -600,6 +677,7 @@ export default {
       if (this.deptBudgetList.tranProcessInfoList.length > 1) {
         this.deptBudgetList.tranProcessInfoList.splice(index, 1)
       }
+      this.number--
     },
     handleChange(value) {
       this.selectedOptions = value
@@ -632,35 +710,35 @@ export default {
     returnsales() {
       this.$router.push({ path: 'tranManagementTransport' })
       this.deptBudgetList = {
-                taskNo: '',
-                totalStorage: 0,
-                goodsName: '玉米',
-                goodsNameKey: 1,
-                warehouseType: '1',
-                tranProcessInfoList: [
-                  {
-                    processNo: '',
-                    tranType: '汽运',
-                    deliveryDateStart: '',
-                    deliveryDateEnd: '',
-                    weight: '',
-                    selectedOptions: [],
-                    selectedOptions1: [],
-                    sendPrivate: '',
-                    sendCity: '',
-                    sendArea: '',
-                    receivePrivate: '',
-                    receiveCity: '',
-                    receiveArea: '',
-                    sendDetailedAddress: '',
-                    receiveDetailedAddress: '',
-                    sender: '',
-                    receiver: '',
-                    senderPhone: '',
-                    receiverPhone: '',
-                  },
-                ],
-              }
+        taskNo: '',
+        totalStorage: 0,
+        goodsName: '玉米',
+        goodsNameKey: 1,
+        warehouseType: '1',
+        tranProcessInfoList: [
+          {
+            processNo: '',
+            tranType: '汽运',
+            deliveryDateStart: '',
+            deliveryDateEnd: '',
+            weight: '',
+            selectedOptions: [],
+            selectedOptions1: [],
+            sendPrivate: '',
+            sendCity: '',
+            sendArea: '',
+            receivePrivate: '',
+            receiveCity: '',
+            receiveArea: '',
+            sendDetailedAddress: '',
+            receiveDetailedAddress: '',
+            sender: '',
+            receiver: '',
+            senderPhone: '',
+            receiverPhone: '',
+          },
+        ],
+      }
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskType.length; i++) {
@@ -672,9 +750,8 @@ export default {
     selecttaskwayList(e, index) {
       for (var i = 0; i < this.taskwayList.length; i++) {
         if (this.taskwayList[i].constValue == e) {
-          this.deptBudgetList.tranProcessInfoList[
-            index
-          ].tranTypeKey = this.taskwayList[i].constKey
+          this.deptBudgetList.tranProcessInfoList[index].tranTypeKey =
+            this.taskwayList[i].constKey
         }
       }
     },
@@ -687,90 +764,89 @@ export default {
     },
     onChange(files) {
       this.fileNum = files
-      this.$refs.upload.handleSaveBill().then(res => {
-      })
+      this.$refs.upload.handleSaveBill().then((res) => {})
     },
 
     submit() {
-      this.$refs.deptBudgetList.validate(valid => {
+      this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           if (!this.deptBudgetList.taskNo) {
-          this.$message({
-            message: '任务编号不能为空！',
-            type: 'warning',
-          })
-          return
-        }
+            this.$message({
+              message: '任务编号不能为空！',
+              type: 'warning',
+            })
+            return
+          }
           if (!this.deptBudgetList.taskType) {
-          this.$message({
-            message: '任务类型不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-         if (!this.deptBudgetList.contractNo) {
-          this.$message({
-            message: '合同编号/移库任务编号不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-         if (!this.deptBudgetList.goodsName) {
-          this.$message({
-            message: '货名不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-           if (!this.deptBudgetList.weight) {
-          this.$message({
-            message: '重量（吨）不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-         if (!this.deptBudgetList.sendWarehouse) {
-          this.$message({
-            message: '发货仓库不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.selectedOptions.length <= 0) {
-          this.$message({
-            message: '始发地不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-      
-         if (!this.deptBudgetList.startDetailedAddress) {
-          this.$message({
-            message: '始发地详细地址不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.selectedOptions1.length <= 0) {
-          this.$message({
-            message: '终到地不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-         if (!this.deptBudgetList.endDetailedAddress) {
-          this.$message({
-            message: '终到地详细地址不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-          if(this.checkList.length <= 0){
-             this.$message({
-                message: '运输方式多选框不能为空！',
-                type: 'warning',
-              })
-              return
+            this.$message({
+              message: '任务类型不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.contractNo) {
+            this.$message({
+              message: '合同编号/移库任务编号不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.goodsName) {
+            this.$message({
+              message: '货名不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.weight) {
+            this.$message({
+              message: '重量（吨）不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.sendWarehouse) {
+            this.$message({
+              message: '发货仓库不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.selectedOptions.length <= 0) {
+            this.$message({
+              message: '始发地不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+
+          if (!this.deptBudgetList.startDetailedAddress) {
+            this.$message({
+              message: '始发地详细地址不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.selectedOptions1.length <= 0) {
+            this.$message({
+              message: '终到地不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.endDetailedAddress) {
+            this.$message({
+              message: '终到地详细地址不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.checkList.length <= 0) {
+            this.$message({
+              message: '运输方式多选框不能为空！',
+              type: 'warning',
+            })
+            return
           }
           for (
             var i = 0;
@@ -789,56 +865,56 @@ export default {
             ) {
               this.$message({
                 message: '发货日期不能大于最晚到货日期！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateStart) {
               this.$message({
-                message:'发货日期不能为空！',
-                type:'warning'
+                message: '发货日期不能为空！',
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].deliveryDateEnd) {
               this.$message({
-                message:'最晚到货日期不能为空！',
-                type:'warning'
+                message: '最晚到货日期不能为空！',
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].weight) {
               this.$message({
                 message: '重量不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].sender) {
               this.$message({
                 message: '发货人不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].senderPhone) {
               this.$message({
                 message: '发货人电话不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].receiver) {
               this.$message({
                 message: '收货人不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
             if (!this.deptBudgetList.tranProcessInfoList[i].receiverPhone) {
               this.$message({
                 message: '收货人电话不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
@@ -847,7 +923,7 @@ export default {
             ) {
               this.$message({
                 message: '收获详细地址不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
@@ -856,21 +932,25 @@ export default {
             ) {
               this.$message({
                 message: '发货详细地址不能为空！',
-                type: 'warning'
+                type: 'warning',
               })
               return
             }
-            
           }
-
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
-           this.deptBudgetList.startPrivate = CodeToText[this.selectedOptions[0]]
-        this.deptBudgetList.startCity = CodeToText[this.selectedOptions[1]]
-         this.deptBudgetList.startArea = CodeToText[this.selectedOptions[2]]
-          
-          for(var i = 0 ; i < this.deptBudgetList.tranProcessInfoList.length ; i++){
+          this.deptBudgetList.startPrivate = CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.startCity = CodeToText[this.selectedOptions[1]]
+          this.deptBudgetList.startArea = CodeToText[this.selectedOptions[2]]
+             this.deptBudgetList.tranProcessInfoList[0].sendPrivate = CodeToText[this.selectedOptions[0]]
+             this.deptBudgetList.tranProcessInfoList[0].sendCity = CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.tranProcessInfoList[0].sendArea = CodeToText[this.selectedOptions[2]]
 
+          for (
+            var i = 0;
+            i < this.deptBudgetList.tranProcessInfoList.length;
+            i++
+          ) {
             this.deptBudgetList.tranProcessInfoList[i].sort = i
             //  this.deptBudgetList.tranProcessInfoList[i].sendPrivate = CodeToText[this.selectedOptions[0]]
             // this.deptBudgetList.tranProcessInfoList[i].sendCity = CodeToText[this.selectedOptions[1]]
@@ -878,13 +958,12 @@ export default {
             // this.deptBudgetList.tranProcessInfoList[i].receivePrivate = CodeToText[this.selectedOptions1[0]]
             // this.deptBudgetList.tranProcessInfoList[i].receiveCity = CodeToText[this.selectedOptions1[1]]
             //  this.deptBudgetList.tranProcessInfoList[i].receiveArea = CodeToText[this.selectedOptions1[2]]
-
           }
-          console.log(this.deptBudgetList,"添加对象")
-         
+          console.log(this.deptBudgetList, '添加对象')
+
           addtrantask(this.deptBudgetList)
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('添加成功')
               this.deptBudgetList = {
                 taskNo: '',
@@ -913,11 +992,10 @@ export default {
                     receiver: '',
                     senderPhone: '',
                     receiverPhone: '',
-                    contractNo:'',
-                    receiveWarehouse:''
-                   
-                  }
-                ]
+                    contractNo: '',
+                    receiveWarehouse: '',
+                  },
+                ],
               }
               this.$router.push({ path: 'tranManagementTransport' })
             })
@@ -929,8 +1007,8 @@ export default {
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
-    }
-  }
+    },
+  },
 }
 </script>
 
@@ -948,7 +1026,8 @@ export default {
 
   height: 50px;
 }
-/deep/.position .el-select, /deep/.el-select {
+/deep/.position .el-select,
+/deep/.el-select {
   width: 100%;
 }
 /deep/.position .ws-info-table .el-form-item .el-form-item__label,
@@ -957,9 +1036,9 @@ export default {
   font-size: 14px;
   color: #8890b1;
 }
-.typeselect{
-  width:42%;
-  margin-left:32px;
+.typeselect {
+  width: 42%;
+  margin-left: 32px;
 }
 .del,
 .add {
@@ -1012,7 +1091,7 @@ export default {
 .el-form {
   margin-top: 50px;
 }
-.endflag{
+.endflag {
   vertical-align: top;
 }
 .el-col {
@@ -1057,8 +1136,10 @@ export default {
     }
   }
 }
-/deep/.el-table--border:after, /deep/.el-table--group:after, /deep/.el-table:before {
-  background:transparent;
+/deep/.el-table--border:after,
+/deep/.el-table--group:after,
+/deep/.el-table:before {
+  background: transparent;
 }
 //输入框标题
 /deep/.ws-info-table .el-form-item .el-form-item__label {
@@ -1089,8 +1170,8 @@ export default {
 .el-cascader {
   width: 100%;
 }
-.el-form{
-      height: 73vh;
-    overflow: scroll;
+.el-form {
+  height: 73vh;
+  overflow: scroll;
 }
 </style>

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -636,7 +636,7 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    add() {
+    add(index) {
       this.deptBudgetList.tranProcessInfoList.push({
           processNo: this.deptBudgetList.taskNo+(this.number),
         sort:0,
@@ -684,7 +684,7 @@ export default {
           this.deptBudgetList.tranProcessInfoList.splice(index, 1)
         }
       }
-      
+      this.number--
     },
     handleChange(value) {
       this.selectedOptions = value
@@ -892,15 +892,21 @@ export default {
           this.deptBudgetList.startPrivate = CodeToText[this.selectedOptions[0]]
         this.deptBudgetList.startCity = CodeToText[this.selectedOptions[1]]
          this.deptBudgetList.startArea = CodeToText[this.selectedOptions[2]]
-        //  for(var i = 0; i< this.deptBudgetList.tranProcessInfoList.length ; i++){
-        //     this.deptBudgetList.tranProcessInfoList[i].sort = i
+            this.deptBudgetList.tranProcessInfoList[0].sendPrivate = CodeToText[this.selectedOptions[0]]
+             this.deptBudgetList.tranProcessInfoList[0].sendCity = CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.tranProcessInfoList[0].sendArea = CodeToText[this.selectedOptions[2]]
+         for(var i = 0; i< this.deptBudgetList.tranProcessInfoList.length ; i++){
+            this.deptBudgetList.tranProcessInfoList[i].sort = i
         //    this.deptBudgetList.tranProcessInfoList[i].sendPrivate = CodeToText[this.selectedOptions[0]]
         //     this.deptBudgetList.tranProcessInfoList[i].sendCity = CodeToText[this.selectedOptions[1]]
         //      this.deptBudgetList.tranProcessInfoList[i].sendArea = CodeToText[this.selectedOptions[2]]
         //     this.deptBudgetList.tranProcessInfoList[i].receivePrivate = CodeToText[this.selectedOptions1[0]]
         //     this.deptBudgetList.tranProcessInfoList[i].receiveCity = CodeToText[this.selectedOptions1[1]]
         //      this.deptBudgetList.tranProcessInfoList[i].receiveArea = CodeToText[this.selectedOptions1[2]]
-        //  }
+        // console.log(CodeToText[this.selectedOptions1[0]],"省")
+        // console.log(CodeToText[this.selectedOptions1[1]],"市")
+        // console.log(CodeToText[this.selectedOptions1[2]],"区")
+         }
           edittran(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -24,26 +24,34 @@
     <div class="basicInformation">
       <div class="annu">
         <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        <el-radio label="1" class="a">出库</el-radio>
-        <el-radio label="2" class="a">入库</el-radio>
-        <el-radio label="3" class="a">移库</el-radio>
-        <el-radio label="4" class="a">退库并出库</el-radio>
-      </el-radio-group>
+          <el-radio label="1" class="a">出库</el-radio>
+          <el-radio label="2" class="a">入库</el-radio>
+          <el-radio label="3" class="a">移库</el-radio>
+          <el-radio label="4" class="a">退库并出库</el-radio>
+        </el-radio-group>
       </div>
       <div class="ding"></div>
-       <div v-if="dataList.taskTypeKey != 2&&dataList.taskTypeKey != 4" class="center1">
-          <img
-            style="position: relative; top: 40px; left: 300px;" 
-            width="19"
-            height="19"
-            src="../../../public/img/cangku.png"
-            alt=""
-          />
+      <div
+        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
+        class="center1"
+      >
+        <img
+          style="position: relative; top: 40px; left: 300px"
+          width="19"
+          height="19"
+          src="../../../public/img/cangku.png"
+          alt=""
+        />
         <!--出库=-->
         <div class="small-title">
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
-        <el-form ref="dataList" :model="dataList" label-width="140px" input-width="300px">
+        <el-form
+          ref="dataList"
+          :model="dataList"
+          label-width="140px"
+          input-width="300px"
+        >
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -62,8 +70,8 @@
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select              
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+            <el-select
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.inOutType"
               placeholder="请选择出库类型"
               class="typeselect"
@@ -85,9 +93,9 @@
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
             <el-select
-            @change='changecontract'
+              @change="changecontract"
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
@@ -100,9 +108,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+          <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
             <el-input
-            @input="selectTaskNo"
+              @input="selectTaskNo"
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
@@ -118,7 +126,7 @@
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
             <el-select
-            :disabled='dataList.taskTypeKey != 3'
+              :disabled="dataList.taskTypeKey != 3"
               v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
@@ -133,7 +141,11 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px" >
+          <el-form-item
+            label="重量（吨）"
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
               v-model="dataList.weight"
               placeholder="请输入重量"
@@ -161,18 +173,22 @@
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
             <el-input
-            @input='bulkDensitychange'
+              @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
-              size="small" 
+              size="small"
               class="huom"
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px" >
+          <el-form-item
+            label="水分（%）<="
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
-            @input='waterContentchange'
+              @input="waterContentchange"
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
@@ -181,9 +197,13 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+          <el-form-item
+            label="单价(元/吨)"
+            span="1"
+            style="margin-left: 650px; margin-top: -40px"
+          >
             <el-input
-            @input='unitPricechange'
+              @input="unitPricechange"
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
@@ -223,29 +243,37 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item v-if='dataList.taskTypeKey != 3' label="业务描述" span="20">
+          <el-form-item
+            v-if="dataList.taskTypeKey != 3"
+            label="业务描述"
+            span="20"
+          >
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="large"
-              
             />
           </el-form-item>
         </el-form>
       </div>
       <div v-show="dataList.taskTypeKey != 1" class="center1">
         <img
-            style="position: relative; top: 40px; left: 300px;" 
-            width="19"
-            height="19"
-            src="../../../public/img/cangku.png"
-            alt=""
-          />
+          style="position: relative; top: 40px; left: 300px"
+          width="19"
+          height="19"
+          src="../../../public/img/cangku.png"
+          alt=""
+        />
         <div class="small-title">
           <h3>入库任务({{ inOutTaskNo1 }} )</h3>
         </div>
-        <el-form v-if='!deletetask' ref="form" :model="form" label-width="140px">
+        <el-form
+          v-if="!deletetask"
+          ref="form"
+          :model="form"
+          label-width="140px"
+        >
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -264,7 +292,7 @@
           <!-- 入库类型 -->
           <el-form-item label="入库类型">
             <el-select
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList1.inOutType"
               placeholder="请选择入库类型"
               class="typeselect"
@@ -286,9 +314,9 @@
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item v-if='dataList1.taskTypeKey != 3' label="合同编号">
+          <el-form-item v-if="dataList1.taskTypeKey != 3" label="合同编号">
             <el-select
-            @change='changecontract1'
+              @change="changecontract1"
               v-model="dataList1.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
@@ -301,9 +329,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if='dataList1.taskTypeKey == 3' label="移库任务编号">
+          <el-form-item v-if="dataList1.taskTypeKey == 3" label="移库任务编号">
             <el-input
-            disabled
+              disabled
               v-model="dataList1.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
@@ -334,21 +362,24 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px"  >
+          <el-form-item
+            label="重量（吨）"
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
-            @input='weightchange'
+              @input="weightchange"
               v-model="dataList1.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
               class="huom"
-              
             />
           </el-form-item>
           <!-- 品级 -->
           <el-form-item label="品级">
             <el-select
-            :disabled='dataList.taskTypeKey == 3'
+              :disabled="dataList.taskTypeKey == 3"
               v-model="dataList1.grade"
               placeholder=""
               class="typeselect"
@@ -365,8 +396,8 @@
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
             <el-input
-            @input='bulkDensitychange'
-            :disabled='dataList.taskTypeKey == 3'
+              @input="bulkDensitychange"
+              :disabled="dataList.taskTypeKey == 3"
               v-model="dataList1.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
@@ -375,10 +406,14 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<="  span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="水分（%）<="
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
-            @input='waterContentchange'
-            :disabled='dataList.taskTypeKey == 3'
+              @input="waterContentchange"
+              :disabled="dataList.taskTypeKey == 3"
               v-model="dataList1.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
@@ -387,10 +422,14 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" >
+          <el-form-item
+            label="单价(元/吨)"
+            span="1"
+            style="margin-left: 650px; margin-top: -40px"
+          >
             <el-input
-            @input='unitPricechange'
-            :disabled='dataList.taskTypeKey == 3'
+              @input="unitPricechange"
+              :disabled="dataList.taskTypeKey == 3"
               v-model="dataList1.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
@@ -430,7 +469,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item v-if='dataList.taskTypeKey != 4' label="业务描述">
+          <el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
             <el-input
               v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -444,7 +483,7 @@
         <!--出库=-->
         <div class="small-title">
           <img
-            style="position: relative; top: 40px; left: -22px;" 
+            style="position: relative; top: 40px; left: -22px"
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
@@ -453,7 +492,6 @@
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
-          
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
             <el-select
@@ -472,8 +510,8 @@
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-            <el-select              
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+            <el-select
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.inOutType"
               placeholder="请选择出库类型"
               class="typeselect"
@@ -495,9 +533,9 @@
             </el-select>
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item v-if='dataList.taskTypeKey != 3' label="合同编号">
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="合同编号">
             <el-select
-            @change='changecontract'
+              @change="changecontract"
               v-model="dataList.contractNo"
               placeholder="请输入合同编号"
               class="typeselect"
@@ -510,9 +548,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if='dataList.taskTypeKey == 3' label="移库任务编号">
+          <el-form-item v-if="dataList.taskTypeKey == 3" label="移库任务编号">
             <el-select
-            @change="selectTaskNo"
+              @change="selectTaskNo"
               v-model="dataList.moveTaskNo"
               placeholder="请输入移库任务编号"
               class="typeselect"
@@ -526,9 +564,9 @@
             </el-select>
           </el-form-item>
           <!-- 货名 -->
-          <el-form-item label="货名" class="huom" >
+          <el-form-item label="货名" class="huom">
             <el-select
-            :disabled='dataList.taskTypeKey != 3'
+              :disabled="dataList.taskTypeKey != 3"
               v-model="dataList.goodsName"
               placeholder="货名"
               class="huom"
@@ -543,9 +581,13 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item label="重量（吨）" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="重量（吨）"
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
-            :disabled='dataList.taskTypeKey == 4'
+              :disabled="dataList.taskTypeKey == 4"
               v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
@@ -556,7 +598,7 @@
           <!-- 品级 -->
           <el-form-item label="品级">
             <el-select
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.grade"
               placeholder=""
               class="typeselect"
@@ -573,7 +615,7 @@
           <!--容重（克/升）>=-->
           <el-form-item label="容重（克/升）>=">
             <el-input
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
@@ -582,9 +624,13 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item
+            label="水分（%）<="
+            span="1"
+            style="margin-left: 350px; margin-top: -40px"
+          >
             <el-input
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
@@ -593,14 +639,18 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item
+            label="单价(元/吨)"
+            span="1"
+            style="margin-left: 650px; margin-top: -40px"
+          >
             <el-input
-            :disabled='dataList.taskTypeKey == 3||dataList.taskTypeKey == 4'
+              :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
-               class="huom"
+              class="huom"
             />
           </el-form-item>
           <!--预计出库日期-->
@@ -660,7 +710,7 @@ import {
   xialaNo,
   addoreditoutput,
   outexamine,
-  getGoodsName
+  getGoodsName,
 } from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
@@ -683,31 +733,33 @@ export default {
     isShow(val) {
       this.showType = val
     },
-    flag(val){
+    flag(val) {
       xialaNo({
         compId: this.compId,
-        flag: val
+        flag: val,
       })
         .toPromise()
         .then((response) => {
-          if(this.dataList1.taskTypeKey == 2 || this.dataList1.taskTypeKey == 4){
-              this.contractNoList1 = response
-              if(this.dataList1.taskTypeKey == 2){
-                this.contractNoList = response
-              }
-          }
-          else{
+          if (
+            this.dataList1.taskTypeKey == 2 ||
+            this.dataList1.taskTypeKey == 4
+          ) {
+            this.contractNoList1 = response
+            if (this.dataList1.taskTypeKey == 2) {
               this.contractNoList = response
+            }
+          } else {
+            this.contractNoList = response
           }
         })
-    }
+    },
   },
   computed: {
     ...mapGetters(['deptBudgetList']),
   },
   data() {
     return {
-      flag:1,
+      flag: 1,
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -717,7 +769,7 @@ export default {
       tableDate: [],
       // 是否显示
       showType: true,
-      disabled:false,
+      disabled: false,
       // 年
       year: '',
       contractNoList: [],
@@ -748,7 +800,7 @@ export default {
       warehouseNameList1: [],
       appendixIdsAdd: '',
       uploadSuccess: {},
-      deletetask:false,
+      deletetask: false,
       warehouseInOutDetail: {},
       onChange: {},
       deptBudgetList1: [],
@@ -825,9 +877,9 @@ export default {
 
       return arr.join('')
     },
-    selectTaskNo(e){
-      if(this.dataList.taskTypeKey==3){
-        this.$set(this.dataList1,'moveTaskNo',e)
+    selectTaskNo(e) {
+      if (this.dataList.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'moveTaskNo', e)
       }
     },
     dataFilter(val) {
@@ -848,67 +900,83 @@ export default {
         this.options = this.staffList
       }
     },
-    weightchange(e){
-      if(this.dataList.taskTypeKey==4){
-        this.$set(this.dataList,'weight',e)
+    weightchange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'weight', e)
       }
     },
-    bulkDensitychange(e){
-      if(this.dataList.taskTypeKey==4){
-        this.$set(this.dataList,'bulkDensity',e)
-      }else if(this.dataList1.taskTypeKey==3){
-        this.$set(this.dataList1,'bulkDensity',e)
+    bulkDensitychange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'bulkDensity', e)
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'bulkDensity', e)
       }
     },
-    waterContentchange(e){
-      if(this.dataList.taskTypeKey==4){
-        this.$set(this.dataList,'waterContent',e)
-      }else if(this.dataList1.taskTypeKey==3){
-        this.$set(this.dataList1,'waterContent',e)
+    waterContentchange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'waterContent', e)
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'waterContent', e)
       }
     },
-    unitPricechange(e){
-      if(this.dataList.taskTypeKey==4){
-        this.$set(this.dataList,'unitPrice',e)
-      }else if(this.dataList1.taskTypeKey==3){
-        this.$set(this.dataList1,'unitPrice',e)
+    unitPricechange(e) {
+      if (this.dataList.taskTypeKey == 4) {
+        this.$set(this.dataList, 'unitPrice', e)
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.$set(this.dataList1, 'unitPrice', e)
       }
     },
     changecontract(e){
-      if(this.dataList.taskTypeKey!=3 ){
+      if(this.dataList.taskTypeKey != 3 ){
         for (let i = 0; i < this.contractNoList.length; i++) {
-          if(this.contractNoList[i].contractNo==e){
-            getGoodsName({ contractId:this.contractNoList[i].id,contractNo:this.contractNoList[i].contractNo}) .toPromise()
-            .then((response) => {
-              this.$set(this.dataList,'goodsName',response.goodsName)
-              this.$set(this.dataList,'goodsNameKey',response.goodsNameKey)
-              this.$set(this.dataList,'grade',response.grade)
-              this.$set(this.dataList,'gradeKey',response.gradeKey)
-              this.$set(this.dataList,'waterContent',response.waterContent)
-              this.$set(this.dataList,'bulkDensity',response.bulkDensity)
-              this.$set(this.dataList,'weight',response.weight)
-              this.$set(this.dataList,'unitPrice',response.unitContractPrice)
+          if (this.contractNoList[i].contractNo == e) {
+            getGoodsName({
+              contractId: this.contractNoList[i].id,
+              contractNo: this.contractNoList[i].contractNo,
             })
-          } 
+              .toPromise()
+              .then((response) => {
+                this.$set(this.dataList, 'goodsName', response.goodsName)
+                this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
+                this.$set(this.dataList, 'grade', response.grade)
+                this.$set(this.dataList, 'gradeKey', response.gradeKey)
+                this.$set(this.dataList, 'waterContent', response.waterContent)
+                this.$set(this.dataList, 'bulkDensity', response.bulkDensity)
+                this.$set(this.dataList, 'weight', response.weight)
+                this.$set(
+                  this.dataList,
+                  'unitPrice',
+                  response.unitContractPrice
+                )
+              })
+          }
         }
       }
     },
     changecontract1(e){
-      if(this.dataList1.taskTypeKey!=3 ){
+      if(this.dataList1.taskTypeKey != 3 ){
         for (let i = 0; i < this.contractNoList.length; i++) {
-          if(this.contractNoList[i].contractNo==e){
-            getGoodsName({ contractId:this.contractNoList[i].id,contractNo:this.contractNoList[i].contractNo}) .toPromise()
-            .then((response) => {
-              this.$set(this.dataList1,'goodsName',response.goodsName)
-              this.$set(this.dataList1,'goodsNameKey',response.goodsNameKey)
-              this.$set(this.dataList1,'grade',response.grade)
-              this.$set(this.dataList1,'gradeKey',response.gradeKey)
-              this.$set(this.dataList1,'waterContent',response.waterContent)
-              this.$set(this.dataList1,'bulkDensity',response.bulkDensity)
-              this.$set(this.dataList1,'weight',response.weight)
-              this.$set(this.dataList1,'unitPrice',response.unitContractPrice)
+          if (this.contractNoList[i].contractNo == e) {
+            getGoodsName({
+              contractId: this.contractNoList[i].id,
+              contractNo: this.contractNoList[i].contractNo,
             })
-          } 
+              .toPromise()
+              .then((response) => {
+                this.$set(this.dataList1, 'goodsName', response.goodsName)
+                this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
+                this.$set(this.dataList1, 'grade', response.grade)
+                this.$set(this.dataList1, 'gradeKey', response.gradeKey)
+                this.$set(this.dataList1, 'waterContent', response.waterContent)
+                this.$set(this.dataList1, 'bulkDensity', response.bulkDensity)
+                this.$set(this.dataList1, 'weight', response.weight)
+                this.$set(
+                  this.dataList1,
+                  'unitPrice',
+                  response.unitContractPrice
+                )
+              })
+          }
         }
       }
     },
@@ -927,23 +995,22 @@ export default {
       }
     },
     requestadd(list, status) {
-          list.compId = sessionStorage.getItem('ws-pf_compId')
-          list.publisher =
-            sessionStorage.getItem('ws-pf_roleName') +
-            sessionStorage.getItem('ws-pf_staffName')
-          addoreditoutput(list)
-            .toPromise()
-            .then((response) => {
-              this.$message.success('添加成功')
-              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
-            })
+      list.compId = sessionStorage.getItem('ws-pf_compId')
+      list.publisher =
+        sessionStorage.getItem('ws-pf_roleName') +
+        sessionStorage.getItem('ws-pf_staffName')
+      addoreditoutput(list)
+        .toPromise()
+        .then((response) => {
+          this.$message.success('添加成功')
+          this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+        })
     },
     //提交按钮
     submit() {
-      this.dataList.inOutFlag=1
-      this.dataList1.inOutFlag=2
+      this.dataList.inOutFlag = 1
+      this.dataList1.inOutFlag = 2
       if (this.dataList.taskTypeKey == 1) {
-        
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.requestadd(this.dataList)
       } else if (this.dataList1.taskTypeKey == 2) {
@@ -955,17 +1022,16 @@ export default {
       ) {
         this.dataList.inOutTaskNo = this.inOutTaskNo
         this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-        if(this.dataList.taskTypeKey == 3){
-          this.dataList.businessDescribe=this.dataList1.businessDescribe
-        }else{
-          this.dataList1.businessDescribe=this.dataList.businessDescribe
+        if (this.dataList.taskTypeKey == 3) {
+          this.dataList.businessDescribe = this.dataList1.businessDescribe
+        } else {
+          this.dataList1.businessDescribe = this.dataList.businessDescribe
         }
         this.requestadd(this.dataList, 'repetition')
         this.dataList1.inOutTaskNo = this.inOutTaskNo1
         this.dataList1.relevanceId = this.dataList.relevanceId
         this.requestadd(this.dataList1, 'repetition')
       }
-      
     },
     selectwarehouseName() {},
     tarechange(e) {
@@ -1000,9 +1066,9 @@ export default {
       for (var i = 0; i < this.gradeList.length; i++) {
         if (this.gradeList[i].constValue == e) {
           this.dataList.gradeKey = this.gradeList[i].constKey
-          if(this.dataList.taskTypeKey==3){
-            this.$set(this.dataList1,'grade',e)
-            this.$set(this.dataList1,'gradeKey',this.gradeList[i].constKey)
+          if (this.dataList.taskTypeKey == 3) {
+            this.$set(this.dataList1, 'grade', e)
+            this.$set(this.dataList1, 'gradeKey', this.gradeList[i].constKey)
           }
         }
       }
@@ -1011,17 +1077,21 @@ export default {
       for (var i = 0; i < this.gradeList.length; i++) {
         if (this.gradeList[i].constValue == e) {
           this.dataList1.packingMethodKey = this.gradeList[i].constKey
-          if(this.dataList1.taskTypeKey==4){
-            this.$set(this.dataList,'grade',e)
-            this.$set(this.dataList,'gradeKey',this.gradeList[i].constKey)
+          if (this.dataList1.taskTypeKey == 4) {
+            this.$set(this.dataList, 'grade', e)
+            this.$set(this.dataList, 'gradeKey', this.gradeList[i].constKey)
           }
         }
       }
     },
     selectstorageType(e) {
-      switch(e){
-        case "采购出库": this.flag = 0;break
-        case "销售出库": this.flag = 1;break
+      switch (e) {
+        case '采购出库':
+          this.flag = 0
+          break
+        case '销售出库':
+          this.flag = 1
+          break
       }
       for (var i = 0; i < this.storageType.length; i++) {
         if (this.storageType[i].constValue == e) {
@@ -1030,9 +1100,13 @@ export default {
       }
     },
     selectstorageType1(e) {
-      switch(e){
-        case "采购入库": this.flag = 0;break
-        case "退库": this.flag = 2;break
+      switch (e) {
+        case '采购入库':
+          this.flag = 0
+          break
+        case '退库':
+          this.flag = 2
+          break
       }
       for (var i = 0; i < this.storageType1.length; i++) {
         if (this.storageType1[i].constValue == e) {
@@ -1062,11 +1136,11 @@ export default {
       } else if (this.dataList.taskTypeKey == 2) {
         this.inOutTaskNo1 = 'RK' + this.getdate() + this.verifyinit()
       } else if (this.dataList.taskTypeKey == 3) {
-        var random=this.getdate() + this.verifyinit()
+        var random = this.getdate() + this.verifyinit()
         this.inOutTaskNo = 'YKC' + random
         this.inOutTaskNo1 = 'YKR' + random
       } else if (this.dataList.taskTypeKey == 4) {
-        var random=this.getdate() + this.verifyinit()
+        var random = this.getdate() + this.verifyinit()
         this.inOutTaskNo = 'TCC' + random
         this.inOutTaskNo1 = 'TCR' + random
       }
@@ -1076,29 +1150,28 @@ export default {
         this.tasknumber()
       }
       this.dataList1.taskTypeKey = e
-      if(this.dataList.taskTypeKey==1){
-        this.dataList.inOutType='销售出库'
-        this.dataList.inOutTypeKey='1'
+      if (this.dataList.taskTypeKey == 1) {
+        this.dataList.inOutType = '销售出库'
+        this.dataList.inOutTypeKey = '1'
         this.flag = 1
       }
-      if(this.dataList1.taskTypeKey==2){
-        this.dataList1.inOutType='采购入库'
-        this.dataList1.inOutTypeKey='1'
+      if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutType = '采购入库'
+        this.dataList1.inOutTypeKey = '1'
         this.flag = 0
-      }
-      else if(this.dataList1.taskTypeKey==3){
-        this.disabled=true
-        this.dataList1.inOutType='移库入库'
-        this.dataList1.inOutTypeKey='3'
-        this.dataList.inOutType='移库出库'
-        this.dataList.inOutTypeKey='3'
-      }else if(this.dataList1.taskTypeKey==4){
-        this.disabled=true
-        this.dataList1.inOutType='退库'
-        this.dataList1.inOutTypeKey='6'
-        this.dataList.inOutType='销售出库'
+      } else if (this.dataList1.taskTypeKey == 3) {
+        this.disabled = true
+        this.dataList1.inOutType = '移库入库'
+        this.dataList1.inOutTypeKey = '3'
+        this.dataList.inOutType = '移库出库'
+        this.dataList.inOutTypeKey = '3'
+      } else if (this.dataList1.taskTypeKey == 4) {
+        this.disabled = true
+        this.dataList1.inOutType = '退库'
+        this.dataList1.inOutTypeKey = '6'
+        this.dataList.inOutType = '销售出库'
         this.flag = 2
-        this.dataList.inOutTypeKey='1'
+        this.dataList.inOutTypeKey = '1'
       }
     },
     GetRandomNum(Min, Max) {
@@ -1107,17 +1180,17 @@ export default {
       return Min + Math.round(Rand * Range)
     },
     getList() {
-        this.tasknumber()
-        this.$set(this.dataList,'inOutType','销售出库')
-        this.$set(this.dataList,'inOutTypeKey','1')
-        this.$set(this.dataList,'goodsName','玉米')
-        this.$set(this.dataList,'goodsNameKey','1')
-        this.$set(this.dataList,'grade','一等品')
-        this.$set(this.dataList,'gradeKey','1')
-        this.$set(this.dataList1,'goodsName','玉米')
-        this.$set(this.dataList1,'goodsNameKey','1')
-        this.$set(this.dataList1,'grade','一等品')
-        this.$set(this.dataList1,'gradeKey','1')
+      this.tasknumber()
+      this.$set(this.dataList, 'inOutType', '销售出库')
+      this.$set(this.dataList, 'inOutTypeKey', '1')
+      this.$set(this.dataList, 'goodsName', '玉米')
+      this.$set(this.dataList, 'goodsNameKey', '1')
+      this.$set(this.dataList, 'grade', '一等品')
+      this.$set(this.dataList, 'gradeKey', '1')
+      this.$set(this.dataList1, 'goodsName', '玉米')
+      this.$set(this.dataList1, 'goodsNameKey', '1')
+      this.$set(this.dataList1, 'grade', '一等品')
+      this.$set(this.dataList1, 'gradeKey', '1')
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
@@ -1142,7 +1215,7 @@ export default {
         })
       xialaNo({
         compId: this.compId,
-        flag: this.flag
+        flag: this.flag,
       })
         .toPromise()
         .then((response) => {
@@ -1227,38 +1300,29 @@ export default {
           this.historyList = response
         })
     },
-
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.getItem('ws-pf_compId'),
-          contractType: this.contractType,
-          currentPage: this.currentPage,
-          pageSize: this.pageSize,
-          searchType: this.searchType,
-          searchKeyWord: this.searchKeyWord,
-          startDate: this.startDate,
-          endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
-
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
+    // async exportlist() {
+    //   const { data } = await export1(
+    //     {
+    //       compId: sessionStorage.getItem('ws-pf_compId'),
+    //       contractType: this.contractType,
+    //       currentPage: this.currentPage,
+    //       pageSize: this.pageSize,
+    //       searchType: this.searchType,
+    //       searchKeyWord: this.searchKeyWord,
+    //       startDate: this.startDate,
+    //       endDate: this.endDate,
+    //     },
+    //     {},
+    //     { responseType: 'blob' }
+    //   ).toPromise()
+    //   downloadFile({
+    //     res: data,
+    //     fileName: `${
+    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
+    //     }_采购合同`,
+    //     type: 'xls',
+    //   })
+    // },
   },
 }
 </script>
@@ -1395,38 +1459,36 @@ export default {
   position: relative;
   width: 100%;
 }
-.annu{
+.annu {
   height: 81px;
-  background: #FFFFFF;
+  background: #ffffff;
   border-radius: 4px;
 }
- 
-.basicInformation
-.el-form-item {
-    width: 50.3333%;
-    border: none;
-    margin: 0;
+
+.basicInformation .el-form-item {
+  width: 50.3333%;
+  border: none;
+  margin: 0;
 }
-.huom{
+.huom {
   width: 100px;
-  
 }
-.el-form{
+.el-form {
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
-  color: #8890B1;
+  color: #8890b1;
   line-height: 16px;
 }
-.a{
+.a {
   margin-left: -32px;
 }
- .el-radio-group {
-    margin-left: 251px;
+.el-radio-group {
+  margin-left: 251px;
 }
-.ding{
+.ding {
   height: 23px;
-  background: #E8ECF6;
+  background: #e8ecf6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
 .winseaview-view {
@@ -1437,18 +1499,18 @@ export default {
   height: 93vh;
 }
 .el-radio-group {
-    font-size: 0;
-    margin-top: 20px;
+  font-size: 0;
+  margin-top: 20px;
 }
 /deep/.el-form {
-    padding: 0 15%;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-wrap: wrap;
-    flex-wrap: wrap;
-    margin-left: 130px;
-    margin-top: 15px;
-    width: 110%;
+  padding: 0 15%;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  margin-left: 130px;
+  margin-top: 15px;
+  width: 110%;
 }
 </style>

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -1,4 +1,4 @@
-//添加司机
+//司机编辑
 <template>
   <div class="container">
     <el-row>
@@ -6,7 +6,12 @@
         <h2 class="bg-left title">编辑司机</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+        >
           <img
             width="6"
             height="10"
@@ -18,12 +23,21 @@
       </el-col>
     </el-row>
 
-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
       <div class="small-title">司机信息</div>
       <div class="drivermessage">
         <ws-info-table>
           <!--司机姓名-->
-          <ws-form-item label="姓名" span="1" prop="contractNo" class="readonly bg-right">
+          <ws-form-item
+            label="姓名"
+            span="1"
+            prop="contractNo"
+            class="readonly bg-right"
+          >
             <ws-input
               v-model="deptBudgetList.driverName"
               placeholder="请输入司机姓名"
@@ -32,7 +46,12 @@
             />
           </ws-form-item>
           <!--手机号-->
-          <ws-form-item label="手机号" span="1" prop="driverPhone" class="readonly">
+          <ws-form-item
+            label="手机号"
+            span="1"
+            prop="driverPhone"
+            class="readonly"
+          >
             <ws-input
               v-model="deptBudgetList.driverPhone"
               placeholder="请输入手机号"
@@ -56,7 +75,12 @@
           </ws-form-item>
 
           <!--身份证号-->
-          <ws-form-item label="身份证号" span="1" prop="driverNo" class="readonly">
+          <ws-form-item
+            label="身份证号"
+            span="1"
+            prop="driverNo"
+            class="readonly"
+          >
             <ws-input
               v-model="deptBudgetList.numberCard"
               placeholder="请输入身份证号"
@@ -69,7 +93,11 @@
         <span v-if="age && age > 60" class="big">{{ age }}岁</span>
       </div>
     </ws-form>
-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
       <div class="small-title">货车信息</div>
       <div
         style="width: 100%"
@@ -98,8 +126,19 @@
           </div>
           <ws-info-table class="el-table">
             <!--车牌号-->
-            <ws-form-item label="车牌号" span="1" prop="carNumber" class="forlist" width="400px">
-              <ws-input v-model="item.carNumber" placeholder="请输入车牌号" maxlength="20" size="small" />
+            <ws-form-item
+              label="车牌号"
+              span="1"
+              prop="carNumber"
+              class="forlist"
+              width="400px"
+            >
+              <ws-input
+                v-model="item.carNumber"
+                placeholder="请输入车牌号"
+                maxlength="20"
+                size="small"
+              />
             </ws-form-item>
             <!--车型-->
             <ws-form-item label="车型" span="1" prop="carModel" class="forlist">
@@ -122,7 +161,12 @@
               </ws-select>
             </ws-form-item>
             <!--车长-->
-            <ws-form-item label="不含车头车长（米）" span="1" prop="carLength" class="forlist">
+            <ws-form-item
+              label="不含车头车长（米）"
+              span="1"
+              prop="carLength"
+              class="forlist"
+            >
               <ws-select
                 v-model="item.carLength"
                 placeholder
@@ -143,11 +187,21 @@
             </ws-form-item>
             <!--载重-->
             <ws-form-item label="载重" span="1" prop="carLoad" class="forlist">
-              <ws-input v-model="item.carLoad" placeholder="请输入载重" maxlength="100" size="small" />
+              <ws-input
+                v-model="item.carLoad"
+                placeholder="请输入载重"
+                maxlength="100"
+                size="small"
+              />
             </ws-form-item>
 
             <!--出厂年份-->
-            <ws-form-item label="出厂年份" span="1" prop="yearManufacture" class="forlist">
+            <ws-form-item
+              label="出厂年份"
+              span="1"
+              prop="yearManufacture"
+              class="forlist"
+            >
               <ws-input
                 v-model="item.yearManufacture"
                 placeholder="请输入年份"
@@ -159,7 +213,11 @@
         </div>
       </div>
     </ws-form>
-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
       <div class="small-title">收款人账户信息</div>
       <div
         style="width: 100%"
@@ -188,13 +246,27 @@
           </div>
           <ws-info-table class="el-table">
             <!--账户类型-->
-            <ws-form-item label="账户类型" span="1" prop="contractNo" class="el-car bg-right">
-              <el-radio v-model="item.accountTypeFlag" label="1">私人账号</el-radio>
-              <el-radio v-model="item.accountTypeFlag" label="2">企业账户</el-radio>
+            <ws-form-item
+              label="账户类型"
+              span="1"
+              prop="contractNo"
+              class="el-car bg-right"
+            >
+              <el-radio v-model="item.accountTypeFlag" label="1"
+                >私人账号</el-radio
+              >
+              <el-radio v-model="item.accountTypeFlag" label="2"
+                >企业账户</el-radio
+              >
             </ws-form-item>
             <!--账号-->
             <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
-              <ws-input v-model="item.bankCard" placeholder="请输入账号" maxlength="100" size="small" />
+              <ws-input
+                v-model="item.bankCard"
+                placeholder="请输入账号"
+                maxlength="100"
+                size="small"
+              />
               <el-upload
                 action="https://www.zthymaoyi.com/upload/admin"
                 :show-file-list="false"
@@ -220,7 +292,12 @@
               </el-upload>
             </ws-form-item>
             <!--开户行-->
-            <ws-form-item label="开户行" span="1" prop="bankDeposit" class="el-car">
+            <ws-form-item
+              label="开户行"
+              span="1"
+              prop="bankDeposit"
+              class="el-car"
+            >
               <ws-input
                 v-model="item.bankDeposit"
                 placeholder="请输入开户行"
@@ -237,11 +314,28 @@
               class="el-car"
               width="150px"
             >
-              <ws-input v-model="item.payeeName" placeholder="请输入姓名" maxlength="100" size="small" />
+              <ws-input
+                v-model="item.payeeName"
+                placeholder="请输入姓名"
+                maxlength="100"
+                size="small"
+              />
             </ws-form-item>
             <!--企业名称-->
-            <ws-form-item label="企业名称" v-else span="1" prop="compName" class="el-car" width="150px">
-              <ws-input v-model="item.compName" placeholder="请输入企业名称" maxlength="100" size="small" />
+            <ws-form-item
+              label="企业名称"
+              v-else
+              span="1"
+              prop="compName"
+              class="el-car"
+              width="150px"
+            >
+              <ws-input
+                v-model="item.compName"
+                placeholder="请输入企业名称"
+                maxlength="100"
+                size="small"
+              />
             </ws-form-item>
 
             <!--身份证号-->
@@ -282,7 +376,12 @@
                 />
               </el-upload>
             </ws-form-item>
-            <ws-form-item label="开户支行" span="1" prop="bankDepositBranch" class="el-car">
+            <ws-form-item
+              label="开户支行"
+              span="1"
+              prop="bankDepositBranch"
+              class="el-car"
+            >
               <ws-select
                 v-model="item.bankDepositBranch"
                 placeholder
@@ -305,9 +404,14 @@
         </div>
       </div>
     </ws-form>
-    <ws-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+    <ws-form
+      ref="deptBudgetList"
+      :rules="mainReportAdd"
+      :model="deptBudgetList"
+    >
+     <div class="small-title">相关附件</div>
       <div class="flex">
-        <div>
+        <div >
           <el-upload
             action="https://www.zthymaoyi.com/upload/admin"
             :show-file-list="false"
@@ -315,9 +419,17 @@
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
           >
-            <el-button class="upload button" size="small" type="primary">行驶证</el-button>
+            <el-button class="upload button" size="small" type="primary"
+              >行驶证</el-button
+            >
           </el-upload>
-          <img v-show="addressUrls.travel" width="100" height="100" :src="addressUrls.travel" alt />
+          <img
+            v-show="addressUrls.travel"
+            width="100"
+            height="100"
+            :src="addressUrls.travel"
+            alt
+          />
         </div>
         <div>
           <el-upload
@@ -327,9 +439,17 @@
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
           >
-            <el-button class="upload button" size="small" type="primary">驾驶证</el-button>
+            <el-button class="upload button" size="small" type="primary"
+              >驾驶证</el-button
+            >
           </el-upload>
-          <img v-if="addressUrls.drive" width="100" height="100" :src="addressUrls.drive" alt />
+          <img
+            v-if="addressUrls.drive"
+            width="100"
+            height="100"
+            :src="addressUrls.drive"
+            alt
+          />
         </div>
         <div>
           <el-upload
@@ -339,9 +459,17 @@
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
           >
-            <el-button class="upload button-green" size="small" type="primary">道路运营证</el-button>
+            <el-button class="upload button-green" size="small" type="primary"
+              >道路运营证</el-button
+            >
           </el-upload>
-          <img v-if="addressUrls.way" width="100" height="100" :src="addressUrls.way" alt />
+          <img
+            v-if="addressUrls.way"
+            width="100"
+            height="100"
+            :src="addressUrls.way"
+            alt
+          />
         </div>
         <div>
           <el-upload
@@ -350,9 +478,10 @@
             :on-success="uploadSuccessHandlequalification"
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
-           
           >
-            <el-button class="upload button-green" size="small" type="primary">从业资格证</el-button>
+            <el-button class="upload button-green" size="small" type="primary"
+              >从业资格证</el-button
+            >
           </el-upload>
           <img
             v-if="addressUrls.qualification"
@@ -370,7 +499,9 @@
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
           >
-            <el-button class="upload button-yellow" size="small" type="primary">身份证正面</el-button>
+            <el-button class="upload button-yellow" size="small" type="primary"
+              >身份证正面</el-button
+            >
           </el-upload>
           <img
             v-if="addressUrls.identityjust"
@@ -388,7 +519,9 @@
             class="avatar-uploader"
             accept=".jpg, .jpeg, .png, .gif"
           >
-            <el-button class="upload button-yellow" size="small" type="primary">身份证反面</el-button>
+            <el-button class="upload button-yellow" size="small" type="primary"
+              >身份证反面</el-button
+            >
           </el-upload>
           <img
             v-if="addressUrls.identityagainst"
@@ -400,9 +533,16 @@
         </div>
       </div>
     </ws-form>
+  
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
     </div>
   </div>
 </template>
@@ -410,7 +550,7 @@
 import {
   provinceAndCityData,
   CodeToText,
-  TextToCode
+  TextToCode,
 } from 'element-china-area-data'
 import {
   lookDriver,
@@ -419,7 +559,7 @@ import {
   getidentity,
   getbank,
   packList,
-  editdriver
+  editdriver,
 } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -427,7 +567,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag
+    mapDrag,
   },
   watch: {
     vesselId(val) {
@@ -435,7 +575,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     let self = this
@@ -443,9 +583,9 @@ export default {
       deptBudgetList: {
         totalStorage: 0,
         drivercarInfo: {
-          goodsName: ''
+          goodsName: '',
         },
-        driverPayeeInfo: {}
+        driverPayeeInfo: {},
       },
       radio: '1',
       carModelList: [],
@@ -462,7 +602,7 @@ export default {
       appendixIdsAdd: '',
       size: 10,
       value1: '',
-      fileList:[],
+      fileList: [],
       unitList: [],
       accessoryBankTFs: false,
       freightspace: [
@@ -473,8 +613,8 @@ export default {
           carLength: '13',
           carLengthKey: '1',
           carLoad: '',
-          yearManufacture: ''
-        }
+          yearManufacture: '',
+        },
       ],
       freightspace1: [
         {
@@ -485,12 +625,12 @@ export default {
           payeeNumberCard: '',
           compName: '',
           bankDeposit: '',
-          bankCard: ''
-        }
+          bankCard: '',
+        },
       ],
       name: '',
       age: '',
-      addressUrls: {}
+      addressUrls: {},
     }
   },
   activated() {
@@ -520,16 +660,13 @@ export default {
     loaddata() {
       lookDriver({ id: this.$route.query.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           // this.selectedOptions.push()
-          
+
           for (var i = 0; i < response.driverPayeeInfoList.length; i++) {
             if (response.driverPayeeInfoList[i].cardAddressUrl != null) {
-              response.driverPayeeInfoList[
-                i
-              ].cardAddressUrlArray = response.driverPayeeInfoList[
-                i
-              ].cardAddressUrl.split(',')
+              response.driverPayeeInfoList[i].cardAddressUrlArray =
+                response.driverPayeeInfoList[i].cardAddressUrl.split(',')
             } else {
               response.driverPayeeInfoList[i].cardAddressUrlArray = []
             }
@@ -544,18 +681,18 @@ export default {
             TextToCode[this.deptBudgetList.residentCityProvincial][
               this.deptBudgetList.residentCityMunicipal
             ].code
-          this.selectedOptions = tmp         
+          this.selectedOptions = tmp
         })
       // 车型
       packList({ constId: 'TRAN1' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.carModelList = response
         })
       // 车长
       packList({ constId: 'TRAN2' })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.carLengthList = response
         })
     },
@@ -569,7 +706,7 @@ export default {
 
       getidentity({ personImg: e.url })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           for (
             var i = 0;
             i < this.deptBudgetList.driverPayeeInfoList.length;
@@ -591,7 +728,7 @@ export default {
       // this.deptBudgetList.cardAddressUrl = e.url
       getbank({ bankImg: e.url })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           for (
             var i = 0;
             i < this.deptBudgetList.driverPayeeInfoList.length;
@@ -640,7 +777,7 @@ export default {
         carLength: '13',
         carLengthKey: '1',
         carLoad: '',
-        yearManufacture: ''
+        yearManufacture: '',
       })
     },
     del(row, index) {
@@ -648,7 +785,7 @@ export default {
         if (row.id) {
           deltrancar({ id: row.id })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('删除成功')
             })
         }
@@ -664,7 +801,7 @@ export default {
         payeeNumberCard: '',
         compName: '',
         bankDeposit: '',
-        bankCard: ''
+        bankCard: '',
       })
     },
     del1(row, index) {
@@ -672,7 +809,7 @@ export default {
         if (row.id) {
           deltranprocess({ id: row.id })
             .toPromise()
-            .then(response => {
+            .then((response) => {
               this.$message.success('删除成功')
             })
         }
@@ -703,18 +840,16 @@ export default {
     selectcarModel(e, index) {
       for (var i = 0; i < this.carModelList.length; i++) {
         if (this.carModelList[i].constValue == e) {
-          this.deptBudgetList.driverCarInfoList[
-            index
-          ].carModelKey = this.carModelList[i].constKey
+          this.deptBudgetList.driverCarInfoList[index].carModelKey =
+            this.carModelList[i].constKey
         }
       }
     },
     selectcarLength(e, index) {
       for (var i = 0; i < this.carLengthList.length; i++) {
         if (this.carLengthList[i].constValue == e) {
-          this.deptBudgetList.driverCarInfoList[
-            index
-          ].carLengthKey = this.carLengthList[i].constKey
+          this.deptBudgetList.driverCarInfoList[index].carLengthKey =
+            this.carLengthList[i].constKey
         }
       }
     },
@@ -724,13 +859,13 @@ export default {
     },
     onChange(files) {
       this.fileNum = files
-      this.$refs.upload.handleSaveBill().then(res => {
+      this.$refs.upload.handleSaveBill().then((res) => {
         console.log(files)
       })
     },
 
     submit() {
-      this.$refs.deptBudgetList.validate(valid => {
+      this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.residentCityProvincial =
@@ -739,8 +874,7 @@ export default {
             CodeToText[this.selectedOptions[1]]
           editdriver(this.deptBudgetList)
             .toPromise()
-            .then(response => {
-              
+            .then((response) => {
               this.$message.success('添加成功')
               this.$router.go(-1)
             })
@@ -752,8 +886,8 @@ export default {
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
-    }
-  }
+    },
+  },
 }
 </script>
 

src/views/tranManagement/tranManagementDriverLook.vue

@@ -1,4 +1,4 @@
-//添加司机
+//查看司机
 <template>
   <div class="container">
     <el-row>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -2,28 +2,31 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-      </template>
+      <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
-         <ws-select
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
+        <ws-select
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
           @change="selecttaskType"
-          :value="searchType"  
+          :value="searchType"
         >
           <ws-option
             v-for="item in taskTypeList"
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
-       <div>
-          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
+        <div>
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
+          >
         </div>
         <el-date-picker
           v-model="inOutDate"
@@ -33,7 +36,6 @@
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-
         >
         </el-date-picker>
         <ws-input
@@ -63,7 +65,7 @@
       <el-table
         class="wenzi"
         :data="warehouseList.records"
-        style="width: 100%;"
+        style="width: 100%"
         height="780"
       >
         <el-table-column type="index" label="序号" width="80">
@@ -74,35 +76,35 @@
         </el-table-column>
         <el-table-column class="table_td" prop="processNo" label="运输任务编号">
         </el-table-column>
-        <el-table-column prop="tranType" label="运输方式">
-        </el-table-column>
+        <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
-
         </el-table-column>
         <el-table-column class="table_td" label="重量（吨）" prop="weight">
-         
         </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" >
-          
+        <el-table-column class="table_td" label="发货" prop="send">
         </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" >
-          
+        <el-table-column class="table_td" label="收货" prop="receive">
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
-         <template scope="scope">
-               {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
-             </template>
+        <el-table-column
+          class="table_td"
+          label="运输周期"
+          prop="tranCycle"
+          width="160"
+        >
+          <template scope="scope">
+            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+          </template>
         </el-table-column>
-      <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <el-popover
-          placement="left"
-          :width="285"
-          trigger="click"
-          visible-arrow="false"
-          @show="history(scope.row)"
-          >
-          <template>
+        <el-table-column prop="status" label="状态">
+          <template slot-scope="scope">
+            <el-popover
+              placement="left"
+              :width="285"
+              trigger="click"
+              visible-arrow="false"
+              @show="history(scope.row)"
+            >
+              <template>
                 <span slot="reference">
                   <span
                     v-if="scope.row.feedbackStatus == '待执行'"
@@ -119,78 +121,79 @@
                   >{{ scope.row.feedbackStatus }}
                 </span>
               </template>
-          <div>
-              <p style="margin-top: 0; padding-left: 10px">历史记录</p>
-              <div v-for="(item, index) in historyList" class="flex">
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+              <div>
+                <p style="margin-top: 0; padding-left: 10px">历史记录</p>
+                <div v-for="(item, index) in historyList" class="flex">
+                  <div class="vertical-text vertical-text-left">
+                    {{ item.updateDate }}
+                  </div>
+                  <div>
+                    <div class="vertical-circle"></div>
+                    <div
+                      v-if="index != historyList.length - 1"
+                      class="vertical-line"
+                    ></div>
+                  </div>
+                  <div class="vertical-text">
+                    {{ item.operateUser }}<br />{{ item.dealMsg }}
+                  </div>
                 </div>
               </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-        </template>
-      </el-table-column>
-      <el-table-column class="table_td" label="接单时间" prop="createDate">
+            </el-popover>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="editClick(scope.row)"
+              alt=""
+            />
+          </template>
         </el-table-column>
-     <el-table-column prop="seller" label="操作" width="300">
-          <template  slot-scope="scope">
-              <template v-if="
+        <el-table-column class="table_td" label="接单时间" prop="createDate">
+        </el-table-column>
+        <el-table-column prop="seller" label="操作" width="300">
+          <template slot-scope="scope">
+            <template
+              v-if="
                 scope.row.tranType == '汽运' &&
                 scope.row.feedbackStatus != '已完成'
-              ">
-                <div class="record" @click="trainSee(scope.row)">查看</div>
-                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
-              </template>
-              <template v-else-if="
+              "
+            >
+              <div class="record" @click="trainSee(scope.row)">查看</div>
+              <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+            </template>
+            <template
+              v-else-if="
                 scope.row.tranType == '汽运' &&
                 scope.row.feedbackStatus == '已完成'
-              ">
-                <div class="record1" @click="trainSee(scope.row)">查看</div>
-              </template>
-               <template v-else>
-                <div class="record1">—— ——</div>
-              </template>
+              "
+            >
+              <div class="record1" @click="trainSee(scope.row)">查看</div>
+            </template>
+            <template v-else>
+              <div class="record1">—— ——</div>
+            </template>
           </template>
         </el-table-column>
       </el-table>
       <div>
         <!-- 分页 -->
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"
-      >
-      </el-pagination>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="currentPage"
+          :page-size="deptCircularPage.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="deptBudgetTotal"
+        >
+        </el-pagination>
       </div>
     </div>
   </div>
 </template>
 <script>
-import {
- shippingList,
- state,
-} from '@/model/transport/index'
+import { shippingList, state } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -226,7 +229,7 @@ export default {
       currentPage: 1,
       pageSize: 10,
       feedbackFlag: 1,
-      searchType:1,
+      searchType: 1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
@@ -235,11 +238,11 @@ export default {
         { value: '已完成', type: 2 },
         { value: '全部任务', type: 3 },
       ],
-      
+
       // 提交类型
       submitType: true,
       size: 10,
-      primary:'1',
+      primary: '1',
       spanArr: [],
       warehouseName: '',
       deptBudgetTotal: 0,
@@ -248,9 +251,9 @@ export default {
       warehouseList: [],
       deptBudgetList: {},
       historyList: [],
-      value2:'',
-      inOutDate:[],
-      pickerOptions:[],
+      value2: '',
+      inOutDate: [],
+      pickerOptions: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -259,21 +262,20 @@ export default {
       accessoryTFs: false,
     }
   },
-  mounted(){
+  mounted() {
     this.getList()
   },
   methods: {
-      //接口
+    //接口
     getList() {
       shippingList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         feedbackFlag: this.feedbackFlag,
-         startDate: this.startDate ,
-        endDate:this.endDate,
-        searchKeyWord : this.searchKeyWord
-        
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
@@ -324,16 +326,16 @@ export default {
           this.spanArr.push(1)
           this.pos = 0
         } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            查找到符合条件的数据时每次要把之前存储的数据 + 1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
         }
       })
     },
@@ -346,7 +348,7 @@ export default {
             id: row.id,
           },
         })
-      }  
+      }
     },
 
     //反馈
@@ -463,16 +465,17 @@ export default {
         })
     },
     find() {
-      if(this.inOutDate != null){
-
-      
-     if (this.inOutDate.length > 0) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
-      } else {
+      if (this.inOutDate != null) {
+        if (this.inOutDate.length > 0) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+      }else{
         this.startDate = ''
-        this.endDate = ''
-      }
+          this.endDate = ''
       }
       this.currentPage = 1
       this.getList()
@@ -527,7 +530,8 @@ export default {
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
 }
-.record,.record1,
+.record,
+.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
@@ -545,19 +549,19 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 60px;
+.el-row {
+  height: 60px;
 }
-.base_header_layout .grid-content{
-    margin-top: 80px;
+.base_header_layout .grid-content {
+  margin-top: 80px;
 }
 
-.el-input--small .el-input__inner{
-    margin-left: 20px;
+.el-input--small .el-input__inner {
+  margin-left: 20px;
 }
 .el-range-editor--small.el-input__inner {
-    height: 32px;
-    margin: 0 10px;
+  height: 32px;
+  margin: 0 10px;
 }
 //状态样式
 .executory,
@@ -588,18 +592,18 @@ export default {
 //     font-size: 14px;
 // }
 /deep/.el-pagination {
-    text-align: center;
-    white-space: nowrap;
-    padding: 2px 5px;
-    color: #303133;
-    font-weight: 700;
-    margin-bottom: 20px;
+  text-align: center;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
 }
-.el-select{
+.el-select {
   width: 30%;
-    margin-right: 10px;
+  margin-right: 10px;
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/tranManagement/tranManagementShipping.vue

@@ -2,24 +2,25 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-      </template>
+      <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
           @change="selecttaskType"
-          :value="searchType"  
+          :value="searchType"
         >
           <ws-option
             v-for="item in taskTypeList"
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
         <div>
@@ -64,7 +65,7 @@
       <el-table
         class="wenzi"
         :data="warehouseList.records"
-        style="width: 100%;"
+        style="width: 100%"
         height="780"
       >
         <el-table-column type="index" label="序号" width="80">
@@ -166,7 +167,7 @@
   </div>
 </template>
 <script>
-import {shippingList, alsostate } from '@/model/transport/index'
+import { shippingList, alsostate } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { EventBus } from 'base-core-lib'
@@ -206,7 +207,7 @@ export default {
       pageSize: 10,
       searchType: 1,
       searchTypeText: '执行中',
-       taskTypeList: [
+      taskTypeList: [
         { value: '执行中', type: 1 },
         { value: '已完成', type: 2 },
         { value: '全部任务', type: '' },
@@ -423,17 +424,18 @@ export default {
         })
     },
     find() {
-      if(this.inOutDate != null){
-
- 
-      if (this.inOutDate.length > 0) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
-      } else {
+      if (this.inOutDate != null) {
+        if (this.inOutDate.length > 0) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+      }else{
         this.startDate = ''
-        this.endDate = ''
+          this.endDate = ''
       }
-           }
       this.currentPage = 1
       this.getList()
     },
@@ -452,11 +454,11 @@ export default {
 //分页
 .el-pagination {
   text-align: center;
-    white-space: nowrap;
-    padding: 2px 5px;
-    color: #303133;
-    font-weight: 700;
-    margin-bottom: 20px;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
 }
 /deep/.el-pager li.active {
   color: #5878e8;
@@ -564,11 +566,11 @@ export default {
   position: relative;
   font-size: 14px;
 }
-.el-select{
+.el-select {
   width: 30%;
-    margin-right: 10px;
+  margin-right: 10px;
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -959,7 +959,7 @@ export default {
   width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 35%;
+  width: 50%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1026,4 +1026,7 @@ export default {
   margin-top: 6px;
   left: 2px;
 }
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
+  padding: 0px;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -2,24 +2,25 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-      </template>
+      <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
           @change="selecttaskType"
-          :value="searchType"  
+          :value="searchType"
         >
           <ws-option
             v-for="item in taskTypeList"
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
         <div>
@@ -61,7 +62,6 @@
       </template>
     </BaseHeaderLayout>
     <div class="container">
-      
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
@@ -74,19 +74,14 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" >
-        </el-table-column>
-        <el-table-column prop="tranType" label="运输方式" >
-        </el-table-column>
-        <el-table-column prop="goodsName" label="货名" >
-        </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）" >
-        </el-table-column>
-        <el-table-column prop="send" label="发货" >
+        <el-table-column prop="processNo" label="运输任务编号">
         </el-table-column>
-        <el-table-column prop="receive" label="收货" >
-        </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160" >
+        <el-table-column prop="tranType" label="运输方式"> </el-table-column>
+        <el-table-column prop="goodsName" label="货名"> </el-table-column>
+        <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+        <el-table-column prop="send" label="发货"> </el-table-column>
+        <el-table-column prop="receive" label="收货"> </el-table-column>
+        <el-table-column prop="tranCycle" label="运输周期" width="160">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
@@ -153,27 +148,31 @@
         <el-table-column prop="createDate" class="table_td" label="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
-          <template  slot-scope="scope">
-              <template v-if="
+          <template slot-scope="scope">
+            <template
+              v-if="
                 scope.row.tranType == '汽运' &&
                 scope.row.feedbackStatus != '已完成'
-              ">
-                <div class="record" @click="trainSee(scope.row)">查看</div>
-                <div class="adjustment" @click="feedback(scope.row)">反馈</div>
-              </template>
-              <template v-else-if="
+              "
+            >
+              <div class="record" @click="trainSee(scope.row)">查看</div>
+              <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+            </template>
+            <template
+              v-else-if="
                 scope.row.tranType == '汽运' &&
                 scope.row.feedbackStatus == '已完成'
-              ">
-                <div class="record1" @click="trainSee(scope.row)">查看</div>
-              </template>
-               <template v-else>
-                <div class="record1">—— ——</div>
-              </template>
+              "
+            >
+              <div class="record1" @click="trainSee(scope.row)">查看</div>
+            </template>
+            <template v-else>
+              <div class="record1">—— ——</div>
+            </template>
           </template>
         </el-table-column>
       </el-table>
-       <el-pagination
+      <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
@@ -222,14 +221,14 @@ export default {
       currentPage: 1,
       pageSize: 10,
       deptBudgetTotal: 0,
-      searchType:1,
+      searchType: 1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
       feedbackFlag: 1,
       searchTypeOne: 1,
-       taskTypeList: [
+      taskTypeList: [
         { value: '执行中', type: 1 },
         { value: '已完成', type: 2 },
         { value: '全部任务', type: 3 },
@@ -237,9 +236,9 @@ export default {
       // 提交类型
       submitType: true,
       size: 10,
-      primary:'1',
+      primary: '1',
       spanArr: [],
-      inOutDate:[],
+      inOutDate: [],
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -287,14 +286,14 @@ export default {
     },
     //查看火运调度详细
     trainSee(row) {
-            if (row.tranType == '汽运') {
+      if (row.tranType == '汽运') {
         this.$router.push({
           path: 'tranManagementTransporFeedbackLook',
           query: {
             id: row.id,
           },
         })
-      } 
+      }
     },
     //反馈
     feedback(row) {
@@ -357,13 +356,13 @@ export default {
         feedbackFlag: this.feedbackFlag,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-         startDate:this.startDate,
-        endDate:this.endDate,
-        searchKeyWord : this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
-            this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.tranManagementList = response
@@ -405,25 +404,26 @@ export default {
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
-          this. feedbackFlag = this.taskTypeList[i].type
+          this.feedbackFlag = this.taskTypeList[i].type
         }
       }
     },
     find() {
-      if(this.inOutDate != null){
-
-      
-     if (this.inOutDate.length > 0) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
+      if (this.inOutDate != null) {
+        if (this.inOutDate.length > 0) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+      }else{
+         this.startDate = ''
+          this.endDate = ''
       }
       this.currentPage = 1
       this.getList()
-    }
+    },
   },
 }
 </script>
@@ -456,7 +456,8 @@ export default {
 }
 
 //操作按钮
-.record,.record1,
+.record,
+.record1,
 .adjustment {
   display: inline-block;
   color: #5878e8;
@@ -518,21 +519,21 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-margin:0 10px;
+  margin: 0 10px;
 }
 /deep/.el-pagination {
-    text-align: center;
-    white-space: nowrap;
-    padding: 2px 5px;
-    color: #303133;
-    font-weight: 700;
-    margin-bottom: 20px;
+  text-align: center;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
 }
-.el-select{
+.el-select {
   width: 30%;
-    margin-right: 10px;
+  margin-right: 10px;
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -2,24 +2,25 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-      </template>
+      <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-         <span style="width: 142px; display: inline-block;color: #8890B1;">状态：</span>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
           @change="selecttaskType"
-          :value="searchType"  
+          :value="searchType"
         >
           <ws-option
             v-for="item in taskTypeList"
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
         <div>
@@ -64,7 +65,7 @@
       <el-table
         class="wenzi"
         :data="tranManagementList.records"
-        style="width: 100%;"
+        style="width: 100%"
         height="780"
       >
         <el-table-column type="index" label="序号" width="80">
@@ -75,15 +76,11 @@
         </el-table-column>
         <el-table-column prop="processNo" label="运输任务编号">
         </el-table-column>
-        <el-table-column prop="goodsName" label="货名" >
-        </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）">
-        </el-table-column>
-        <el-table-column prop="send" label="发货">
-        </el-table-column>
-        <el-table-column prop="receive" label="收货">
-        </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" >
+        <el-table-column prop="goodsName" label="货名"> </el-table-column>
+        <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+        <el-table-column prop="send" label="发货"> </el-table-column>
+        <el-table-column prop="receive" label="收货"> </el-table-column>
+        <el-table-column prop="tranCycle" label="运输周期">
           <template scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
@@ -151,17 +148,21 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-             <div
+            <div
               class="record"
               @click="trainSee(scope.row)"
-              v-hasPermission="'transportationTask.transportation.fireDispatching.view'"
+              v-hasPermission="
+                'transportationTask.transportation.fireDispatching.view'
+              "
             >
               查看
             </div>
-             <div
+            <div
               class="adjustment"
               @click="trainNumber(scope.row)"
-              v-hasPermission="'transportationTask.transportation.fireDispatching.car'"
+              v-hasPermission="
+                'transportationTask.transportation.fireDispatching.car'
+              "
             >
               车次
             </div>
@@ -184,10 +185,8 @@
 import { automobileList, alsostate } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import {  EventBus } from 'base-core-lib'
-import {
-  billoperatehis,
-} from '@/model/contarct/index'
+import { EventBus } from 'base-core-lib'
+import { billoperatehis } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -218,7 +217,7 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      deptBudgetTotal:0,
+      deptBudgetTotal: 0,
       searchTypeText: '执行中',
       searchKeyWord: '',
       tranTypeKey: 2,
@@ -350,7 +349,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.tranManagementList = response
-           this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
         })
@@ -424,14 +423,17 @@ export default {
         })
     },
     find() {
-      if(this.inOutDate != null){
-      if (this.inOutDate.length !=0) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
+      if (this.inOutDate != null) {
+        if (this.inOutDate.length != 0) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+      }else{
+         this.startDate = ''
+          this.endDate = ''
       }
       this.currentPage = 1
       this.getList()
@@ -536,18 +538,18 @@ export default {
   margin: 0 10px;
 }
 /deep/.el-pagination {
-    text-align: center;
-    white-space: nowrap;
-    padding: 2px 5px;
-    color: #303133;
-    font-weight: 700;
-    margin-bottom: 20px;
+  text-align: center;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
 }
-.el-select{
+.el-select {
   width: 30%;
-    margin-right: 10px;
+  margin-right: 10px;
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -2,29 +2,31 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-      </template>
+      <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890B1;">状态：</span>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
           @change="selecttaskType"
           :value="searchType"
-      
         >
           <ws-option
             v-for="item in taskTypeList"
             :key="item.value"
             :label="item.value"
             :value="item.value"
-            style="color: #8890B1;"
+            style="color: #8890b1"
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
+          >
         </div>
         <el-date-picker
           v-model="inOutDate"
@@ -64,7 +66,7 @@
       <el-table
         class="wenzi"
         :data="warehouseList.records"
-        style="width: 100%;"
+        style="width: 100%"
         height="780"
       >
         <el-table-column prop="warehouseName" label="序号" width="80">
@@ -73,7 +75,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" >
+        <el-table-column prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
@@ -103,13 +105,20 @@
                     v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  <span
+                    v-if="scope.row.processStatus == '已完成'"
+                    class="done"
+                  ></span
                   >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
                 <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" :key='index' class="flex">
+                <div
+                  v-for="(item, index) in historyList"
+                  :key="index"
+                  class="flex"
+                >
                   <div class="vertical-text vertical-text-left">
                     {{ item.updateDate }}
                   </div>
@@ -139,23 +148,12 @@
         <el-table-column prop="createDate" label="接单时间"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div
-              class="record"
-              @click="nocomplete(scope.row)"
-              
-            >
-              查看
-            </div>
-            <div
-              class="adjustment"
-              @click="warehousing(scope.row)"
-            >
-                派车
-            </div>
+            <div class="record" @click="nocomplete(scope.row)">查看</div>
+            <div class="adjustment" @click="warehousing(scope.row)">派车</div>
           </template>
         </el-table-column>
       </el-table>
-       <el-pagination
+      <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :current-page="currentPage"
@@ -168,13 +166,11 @@
   </div>
 </template>
 <script>
-import { automobileList,alsostate } from '@/model/transport/index'
+import { automobileList, alsostate } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import {  EventBus } from 'base-core-lib'
-import {
-  billoperatehis,
-} from '@/model/contarct/index'
+import { EventBus } from 'base-core-lib'
+import { billoperatehis } from '@/model/contarct/index'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -204,16 +200,16 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-    deptBudgetTotal :0,
+      deptBudgetTotal: 0,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
-      searchType:1,
+      searchType: 1,
       // 提交类型
       submitType: true,
       size: 10,
       spanArr: [],
-      inOutDate:[],
+      inOutDate: [],
       tranTypeKey: '1',
       warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -221,7 +217,7 @@ export default {
       warehouseList: [],
       deptBudgetList: {},
       historyList: [],
-       taskTypeList: [
+      taskTypeList: [
         { value: '执行中', type: 1 },
         { value: '已完成', type: 2 },
         { value: '全部任务', type: '' },
@@ -248,37 +244,6 @@ export default {
         },
       })
     },
-    // getSpanArr(data) {
-    //   let that = this
-
-    //   //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-
-    //   that.spanArr = []
-
-    //   that.pos = 0
-
-    //   //遍历数据
-
-    //   data.forEach((item, index) => {
-    //     //判断是否是第一项
-
-    //     // if (index === 0) {
-    //     //   this.spanArr.push(1)
-    //     //   this.pos = 0
-    //     // } else {
-    //     //不是第一项时，就根据标识去存储
-    //     if (data[index].warehouseNumViewList.length > 1) {
-    //       // 查找到符合条件的数据时每次要把之前存储的数据+1
-    //       this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-    //       this.spanArr.push(0)
-    //     } else {
-    //       // 没有符合的数据时，要记住当前的index
-    //       this.spanArr.push(1)
-    //       this.pos = index
-    //     }
-    //     // }
-    //   })
-    // },
     //查看//传参
     nocomplete(row) {
       this.$router.push({
@@ -323,7 +288,7 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    changestatus(state){
+    changestatus(state) {
       this.searchType = state
       this.getList()
     },
@@ -333,14 +298,14 @@ export default {
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
-        startDate: this.startDate ,
-       endDate: this.endDate ,
-       searchKeyWord :this.searchKeyWord,
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
         tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
         .then((response) => {
-           this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
           this.warehouseList = response
@@ -384,30 +349,6 @@ export default {
         }
       }
     },
-    // fujian(row) {
-    //   if (
-    //     row.receiveAttachmentPath === null ||
-    //     row.receiveAttachmentPath === ''
-    //   ) {
-    //     EventBus.$emit(
-    //       'warning',
-    //       this.$t('system.noticeCircular.NoInformation')
-    //     )
-    //   } else {
-    //     this.accessoryTFs = true
-    //   }
-    //   this.appendixIdss = row.receiveAttachmentPath
-    // },
-    // 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()
@@ -416,18 +357,21 @@ export default {
         })
     },
     find() {
-      if(this.inOutDate != null){
-       if (this.inOutDate.length > 0) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
-      } else {
+      if (this.inOutDate != null) {
+        if (this.inOutDate.length > 0) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+      }else{
         this.startDate = ''
-        this.endDate = ''
+          this.endDate = ''
       }
-        }
       this.currentPage = 1
       this.getList()
-    }
+    },
   },
 }
 </script>
@@ -541,21 +485,21 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin:0 10px; 
+  margin: 0 10px;
 }
 /deep/.el-pagination {
-    text-align: center;
-    white-space: nowrap;
-    padding: 2px 5px;
-    color: #303133;
-    font-weight: 700;
-    margin-bottom: 20px;
+  text-align: center;
+  white-space: nowrap;
+  padding: 2px 5px;
+  color: #303133;
+  font-weight: 700;
+  margin-bottom: 20px;
 }
-.el-select{
+.el-select {
   width: 30%;
-    margin-right: 10px;
+  margin-right: 10px;
 }
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
 }
 </style>