前端gjy

package-lock.json

@@ -14375,7 +14375,7 @@
     },
     "node-sass": {
       "version": "4.14.1",
-      "resolved": "https://registry.npm.taobao.org/node-sass/download/node-sass-4.14.1.tgz",
+      "resolved": "https://registry.nlark.com/node-sass/download/node-sass-4.14.1.tgz?cache=0&sync_timestamp=1620488284683&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-sass%2Fdownload%2Fnode-sass-4.14.1.tgz",
       "integrity": "sha1-mch+wu+3BH7WOPtMnbfzpC4iF7U=",
       "requires": {
         "async-foreach": "^0.1.3",
@@ -14399,12 +14399,12 @@
       "dependencies": {
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "resolved": "https://registry.nlark.com/chalk/download/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "requires": {
             "ansi-styles": "^2.2.1",
@@ -14416,7 +14416,7 @@
         },
         "cross-spawn": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz?cache=0&sync_timestamp=1609302869441&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-3.0.1.tgz",
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "requires": {
             "lru-cache": "^4.0.1",
@@ -14425,7 +14425,7 @@
         },
         "lru-cache": {
           "version": "4.1.5",
-          "resolved": "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz",
+          "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz?cache=0&sync_timestamp=1594427569171&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-4.1.5.tgz",
           "integrity": "sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=",
           "requires": {
             "pseudomap": "^1.0.2",
@@ -14434,7 +14434,7 @@
         },
         "node-gyp": {
           "version": "3.8.0",
-          "resolved": "https://registry.npm.taobao.org/node-gyp/download/node-gyp-3.8.0.tgz",
+          "resolved": "https://registry.nlark.com/node-gyp/download/node-gyp-3.8.0.tgz",
           "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
           "requires": {
             "fstream": "^1.0.0",
@@ -14461,12 +14461,12 @@
         },
         "semver": {
           "version": "5.3.0",
-          "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1616463540350&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         },
         "supports-color": {
           "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
+          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1618561027869&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
         },
         "tar": {
@@ -14481,7 +14481,7 @@
         },
         "yallist": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz",
           "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
         }
       }
@@ -20831,7 +20831,7 @@
       }
     },
     "winsea-component-library": {
-      "version": "http://maven.zthymaoyi.com/nexus/repository/npm-hosted/winsea-component-library/-/winsea-component-library-1.0.1.tgz",
+      "version": "http://47.101.10.107:8081/repository/npm-hossted/winsea-component-library/-/winsea-component-library-1.0.1.tgz",
       "integrity": "sha512-qRQ4BPiIsFj6QqoJIBDiC+IniGkTBhrpyjXRhp/TWTG/s1igUjn9D4acCmkeCsFRgevvlkDfEme0Na8tmhmtDg==",
       "requires": {
         "ali-oss": "^6.5.1",

src/views/tranManagement/tranManagementShipping.vue

@@ -88,7 +88,9 @@
           
         </el-table-column>
         <el-table-column class="table_td" label="运输周期" prop="tranCycle">
-         
+         <template scope="scope">
+               {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
+             </template>
         </el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -28,155 +28,83 @@
         <ws-info-table>
           <!-- 任务编号 -->
           <ws-form-item label="任务编号" span="1" prop="processNo">
-            <ws-input
-             
-              v-model="deptBudgetList.processNo"
-              placeholder="请输入任务编号"
-              maxlength="20"
-              size="small"
-            />
-          </ws-form-item>
+          {{deptBudgetList.processNo}}
+        </ws-form-item>
         <!-- 货名 -->
           <ws-form-item label="货名" span="1" prop="goodsName">
-            <ws-input
-              v-model="deptBudgetList.goodsName"
-              placeholder="请输入货名"
-              maxlength="20"
-              size="small"
-              />
-          </ws-form-item>
+            {{deptBudgetList.goodsName}}
+        </ws-form-item>
           <!--重量（吨）-->
-          <ws-form-item
-            label="重量（吨）"
-            span="1"
-            prop="weight"
-            class="readonly"
-          >
-            <ws-input
-             
-              v-model="deptBudgetList.weight"
-              placeholder="请输入重重"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
-
+          <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{deptBudgetList.weight}}
+        </ws-form-item>
           <!--发货地址-->
           <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-            <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.sendDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-            />
+            
+            {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
           </ws-form-item>
          <!--发货人-->
           <ws-form-item label="发货人" span="1" prop="sender">
-            <ws-input
-              v-model="deptBudgetList.sender"
-              placeholder="请输入发货人姓名"
-              maxlength="100"
-              size="small"
-          />
+          
+          {{deptBudgetList.sender}}
           </ws-form-item>
 
           <!--发货人电话-->
           <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-            <ws-input
-              v-model="deptBudgetList.senderPhone"
-              placeholder="请输入发货人电话"
-              maxlength="100"
-              size="small"
-            />
+            
+            {{deptBudgetList.senderPhone}}
           </ws-form-item>
           <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-            <ws-input
-              readonly="readonly"
-              v-model="deptBudgetList.receiveDetailedAddress"
-              placeholder=""
-              maxlength="120"
-              size="small"
-            />
+            
+             {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
         </ws-form-item>
          <!--收货人-->
           <ws-form-item label="收货人" span="1" prop="receiver">
-            <ws-input
-              v-model="deptBudgetList.receiver"
-              placeholder="请输入发货人"
-              maxlength="100"
-              size="small"
-          />
+            {{deptBudgetList.receiver}}
           </ws-form-item>
 
           <!--收货人电话-->
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-            <ws-input
-              v-model="deptBudgetList.receiverPhone"
-              placeholder="请输入收货人电话"
-              maxlength="100"
-              size="small"
-            />
+           
+             {{deptBudgetList.receiverPhone}}
           </ws-form-item>
           <!--发货日期-->
-          <ws-form-item
-            label="发货日期"
-            span="1"
-            prop="deliveryDateStart"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="deptBudgetList.deliveryDateStart"
-              type="date"
-              placeholder="请选择发货日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
+          <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          
+          {{deptBudgetList.deliveryDateStart}}
+        </ws-form-item>
            <!--最晚发货日期-->
-          <ws-form-item
-            label="最晚发货日期"
-            span="1"
-            prop="deliveryDateEnd"
-            class="deliverydate"
-          >
-            <ws-date-picker
-              v-model="deptBudgetList.deliveryDateEnd"
-              type="date"
-              placeholder="请选择最晚发货日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
+          <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          
+          {{deptBudgetList.deliveryDateEnd}}
+        </ws-form-item>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.contractNo"
-              placeholder="请输入合同编号"
-              maxlength="100"
-              size="small"
-            />
+            
+            {{deptBudgetList.contractNo}}
           </ws-form-item>
           
         </ws-info-table>
       
-      <div class="small-title"><h2>联络员及航次</h2></div>
+      <div class="small-title" ><h2>联络员及航次</h2></div>
         <div
           style="width: 100%"
           class="flex position"
-          
+          :model="deptBudgetList"
         >
         <ws-info-table>
           <!--姓名-->
          <ws-form-item label="姓名" span="1" prop="driver">
             <el-select
               v-model="deptBudgetList.driver"
-              placeholder="请选择负责人"
+              placeholder="请选择姓名"
               filterable
               :filter-method="dataFilter"
               @change="selectstaff"
             >
               <el-option
-                v-for="item in driver"
+                v-for="item in options"
                 :key="item.value"
                 :label="item.staffName"
                 :value="item.staffName"
@@ -184,30 +112,31 @@
             </el-select>
           </ws-form-item>
           <!--电话-->
-          <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-select
-                v-model="deptBudgetList.driverPhone"
-                placeholder="联络员电话"
-            ></ws-select>
-          </ws-form-item>
+          <ws-form-item label="电话" span="1" prop="driverPhone">
+          <ws-input
+            v-model="deptBudgetList.driverPhone"
+            placeholder="请输入电话"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-select
-                v-model="deptBudgetList.sendDateStart"
-                placeholder="请选择日期"
-                class="typeselect"
-               
-            ></ws-select>
+            <ws-date-picker
+            v-model="deptBudgetList.sendDateStart"
+            type="date"
+            placeholder="请选择发货日期"
+            value-format="yyyy-MM-dd"
+          />
           </ws-form-item>
           <!--预计到港日-->
           <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-            <ws-input
-              v-model="deptBudgetList.receiveDateEnd"
-              type="date"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-              size="small"
-            />
+            <ws-date-picker
+            v-model="deptBudgetList.receiveDateEnd"
+            type="date"
+            placeholder="请选择发货日期"
+            value-format="yyyy-MM-dd"
+          />
           </ws-form-item>
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
@@ -228,16 +157,23 @@
             ></ws-input>
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+        <ws-form-item label="类型" span="1" prop="shipType" class="siji">
           <ws-select
-          v-model="deptBudgetList.impurity"
-          placeholder=""
-          size="small"
-          ></ws-select>
+            v-model="deptBudgetList.shipType"
+            placeholder="请输入"
+            class="typeselect"
+          >
+            <ws-option
+              v-for="item in shipType"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
         </ws-form-item>
         <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
           <ws-input
-          v-model="deptBudgetList.impurity"
+          v-model="deptBudgetList.boxNumber"
           placeholder="请输入数量"
           size="small"
           ></ws-input>
@@ -248,16 +184,26 @@
       <div
           style="width: 100%"
           class="flex position"
-         
+         :model="deptBudgetList"
+         v-show="deptBudgetList.shipType == '散船'"
         >
         <ws-info-table>
           <!-- 姓名 -->
-          <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <ws-select
-            v-model="deptBudgetList.driver"
-            placeholder="请选择联络员"
-            size="small"
-            ></ws-select>
+          <ws-form-item label="姓名" span="1" prop="driver">
+            <el-select
+              v-model="deptBudgetList.driver"
+              placeholder="请选择姓名"
+              filterable
+              :filter-method="dataFilter"
+              @change="selectstaff"
+            >
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
           </ws-form-item>
           <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
@@ -302,9 +248,9 @@
             ></ws-input>
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+        <ws-form-item label="类型" span="1" prop="shipType" class="siji">
           <ws-select
-          v-model="deptBudgetList.tranType"
+          v-model="deptBudgetList.shipType"
           placeholder=""
           size="small"
           ></ws-select>
@@ -322,11 +268,12 @@
           style="width: 100%"
           class="flex position"
           v-for="(item, index) in freightspace"
+          
         >
      <ws-info-table>
-        <ws-form-item :label="'仓位号1-'+ (index+1)" span="1" prop="impurity" class="bot">
+        <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
             <ws-input
-          v-model="deptBudgetList.impurity"
+          v-model="item.impurity"
           placeholder="请输入仓位号"
           size="small"
           ></ws-input>
@@ -334,7 +281,7 @@
           <!-- 重量（吨） -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
           <ws-input
-          v-model="deptBudgetList.impurity"
+          v-model="item.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
           ></ws-input>
@@ -376,7 +323,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {shippingLook,shippingList } from '@/model/transport/index'
+import {shippingLook,packList,dispatchCat} from '@/model/transport/index'
 import{getstaff}from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -409,6 +356,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      shipType:[],
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
@@ -425,12 +373,11 @@ export default {
       appendixIdsAdd: '',
       uploadSuccess: {},
       onChange: {},
-      driver:[],
+      selectedOptions: [],
         options:[],
+      tranCarInfoList: {},
         staffList :[],
-
       gradeList: [],
-       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       rules: {
         netWeight: [
           {
@@ -441,6 +388,12 @@ export default {
           },
         ],
       },
+      arr:[],
+      freightspace: [
+        {
+          impurity:'',
+        },
+      ],
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -464,40 +417,38 @@ export default {
     }
   },
   mounted() {
-    this.deptBudgetList.infoId = this.$route.query.infoId
-    this.deptBudgetList.processId = this.$route.query.processId
-    this.deptBudgetList.driver = this.$route.query.driver
-    this.deptBudgetList.driverType = this.$route.query.driverType
-    this.deptBudgetList.driverPhone = this.$route.query.driverPhone
-    this.deptBudgetList.shipNo = this.$route.query.shipNo
-    this.deptBudgetList.loadWeight = this.$route.query.loadWeight
-    this.deptBudgetList.shipName = this.$route.query.shipName
-    this.deptBudgetList.shipType = this.$route.query.shipType
-    this.deptBudgetList.boxNumber = this.$route.query.boxNumber
-    this.deptBudgetList.positionWeight = this.$route.query.positionWeight
-    this.deptBudgetList.sendDateStart = this.$route.query.sendDateStart
-    this.deptBudgetList.receiveDateEnd = this.$route.query.receiveDateEnd
-    this.getList1()
+    this.getList()
     
   },
  activated(){
    this.loaddata()
  },
+ computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+  },
   methods: {
     getList(){
-    
      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
         .then((response) => {
-          // this.agent = response
           this.options = response
            this.staffList = response
-
         })
-
+        //类型
+        packList({ constId: 'TRAN4' })
+        .toPromise()
+        .then((response) => {
+          this.shipType = response
+        })
    },
     dataFilter(val) {
-      this.deptBudgetList.driver = val
+      this.deptBudgetList.personCharge = val
       if (val) {
         console.log(val)
         this.options = this.staffList.filter((item) => {
@@ -515,7 +466,7 @@ export default {
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
           this.deptBudgetList.personChargeKey = this.staffList[i].staffId
         }
       }
@@ -527,23 +478,9 @@ export default {
           this.deptBudgetList = response
     })
   },
-    getList1(){
-      console.log(123456)
-      shippingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage:this.currentPage,
-        pageSize:this.pageSize,
-        contractType:this.contractType,
-        tranTypeKey: this.tranTypeKey, 
-      })
-      .toPromise()
-      .then((response)=>{
-        this.warehouseList = response 
-      })
-    },
     //返回按钮
     revert() {
-      this.$router.push({ path: 'tranManagementVehicle' })
+      this.$router.push({ path: 'tranManagementShipping' })
     },
     del(index){
         if(this.freightspace.length > 1 ){
@@ -552,14 +489,22 @@ export default {
     },
       add() {
       this.freightspace.push({
-        binNumber: '',
-        maxStorage: '',
-        remark: '',
+       impurity:'',
       })
     },
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementShipping' })
+    },
     //提交按钮
     submit() { 
-      this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
+      this.$confirm(`提交成功后，任务将下发给相关人员，是否确定提交?`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
@@ -567,19 +512,43 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              this.deptBudgetList.compId = sessionStorage.getItem(
-                'ws-pf_compId'
-              )
-              this.deptBudgetList.inOutFlag = 2
-              this.deptBudgetList.statusFlag = 1
-              addstorageputList(this.deptBudgetList)
+              
+             for(var i = 0; i < this.freightspace.length; i++){
+               var num  = this.freightspace[i].impurity + "/" + this.freightspace[i].positionWeight
+               this.arr.push(
+                 num
+               )  
+             }
+             
+             console.log(this.arr,"字符串")
+             this.deptBudgetList.totalStorage = this.totalStorage
+             this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.deliveryDateStart = this.deptBudgetList.deliveryDateStart
+              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
+              this.tranCarInfoList.shipName = this.deptBudgetList.shipName
+              this.tranCarInfoList.shipNo = this.deptBudgetList.shipNo
+              this.tranCarInfoList.tranType = this.deptBudgetList.tranType
+              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
+              this.tranCarInfoList.boxNo = this.arr.toString()
+              var tranCarInfo = {}
+              var tranList = [this.tranCarInfoList]
+              tranCarInfo.id = this.deptBudgetList.id
+              tranCarInfo.infoId = this.deptBudgetList.infoId
+              tranCarInfo.tranCarInfoList = tranList
+              dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('暂存成功')
-                  this.$router.push({ path: 'warehouseManagementList' })
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementShipping',
+                  })
                 })
             } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
               return false
             }
           })
@@ -588,19 +557,6 @@ export default {
           return false
         })
     },
-  //  getList() {
-  //     shippingArrangemen({  
-  //       compId: sessionStorage.getItem('ws-pf_compId'),
-  //       currentPage:this.currentPage,
-  //       pageSize:this.pageSize,
-  //       contractType:this.contractType,
-  //       tranTypeKey: this.tranTypeKey,
-  //       })
-  //       .toPromise()
-  //       .then((response) => {
-  //         this.warehouseList = response
-  //       })
-  //   },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -614,26 +570,6 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    // getList() {
-    //   // 货名
-    //   pullDown({ constId: 'CON2' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.goodnameList = response
-    //     })
-    //   // 品级
-    //   pullDown({ constId: 'CON3' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.gradeList = response
-    //     })
-    //   // 类型
-    //   pullDown({ constId: 'CON5' })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.storageType = response
-    //     })
-    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
@@ -641,20 +577,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
-    // },
     approve() {},
     listQuery() {},
   },

src/views/tranManagement/tranManagementShippingLook.vue

@@ -169,70 +169,78 @@
         <ws-info-table>
           <!--姓名-->
           <ws-form-item label="姓名" span="1"  prop="driver" class="siji" >
-            <ws-input
+            <!-- <ws-input
                 v-model="deptBudgetList.driver"
                 placeholder="请选择联络员"
 
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.driver}}
           </ws-form-item>
          <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-input
+            <!-- <ws-input
             v-model="deptBudgetList.driverPhone"
             placeholder="联络员电话"
             size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.driverPhone}}
           </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-select
+            <!-- <ws-select
                 v-model="deptBudgetList.sendDateStart"
                 placeholder="请选择日期"
                 
-            ></ws-select>
+            ></ws-select> -->
+            {{deptBudgetList.sendDateStart}}
           </ws-form-item>
           <!--预计到港日-->
           <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.receiveDateEnd"
               type="date"
               placeholder="请选择日期"
               value-format="yyyy-MM-dd"
               size="small"
-            />
+            /> -->
+            {{deptBudgetList.receiveDateEnd}}
           </ws-form-item>
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipName}}
           </ws-form-item>
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipNo"
               placeholder="请选择航次"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipNo}}
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="impurity" class="siji">
-          <ws-select
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+          <!-- <ws-select
+          v-model="deptBudgetList.tranType"
           placeholder=""
           size="small"
-          ></ws-select>
+          ></ws-select> -->
+          {{deptBudgetList.tranType}}
         </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="impurity" class="siji">
-          <ws-input
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
+          <!-- <ws-input
+          v-model="deptBudgetList.boxNumber"
           placeholder="请输入数量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.boxNumber}}
         </ws-form-item>
         </ws-info-table>
       </div>
@@ -246,69 +254,77 @@
         <ws-info-table>
           <!-- 姓名 -->
           <ws-form-item label="姓名" span="1" prop="driver" class="siji">
-            <ws-select
+            <!-- <ws-select
             v-model="deptBudgetList.driver"
             placeholder="请选择联络员"
             size="small"
-            ></ws-select>
+            ></ws-select> -->
+             {{deptBudgetList.driver}}
           </ws-form-item>
           <!-- 电话 -->
           <ws-form-item label="电话" span="1" prop="driverPhone" class="siji">
-            <ws-input
+            <!-- <ws-input
             v-model="deptBudgetList.driverPhone"
             placeholder="联络员电话"
             size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.driverPhone}}
           </ws-form-item>
           <!--发船日期-->
           <ws-form-item label="发船日期" span="1" prop="sendDateStart" class="siji">
-            <ws-input
+            <!-- <ws-input
                 v-model="deptBudgetList.sendDateStart"
                 placeholder="请选择日期"
                 
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.sendDateStart}}
           </ws-form-item>
         <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd" class="siji">
-          <ws-input
+          <!-- <ws-input
               v-model="deptBudgetList.receiveDateEnd"
               type="date"
               placeholder="请选择日期"
               value-format="yyyy-MM-dd"
               size="small"
-            />
+            /> -->
+            {{deptBudgetList.receiveDateEnd}}
         </ws-form-item>
           <!-- 船名 -->
           <ws-form-item label="船名" span="1" prop="shipName" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipName"
               placeholder="请输入船名"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipName}}
           </ws-form-item>
           <!-- 航次 -->
           <ws-form-item label="航次" span="1" prop="shipNo" class="siji">
-            <ws-input 
+            <!-- <ws-input 
               v-model="deptBudgetList.shipNo"
               placeholder="请选择航次"
               maxlength="100"
               size="small"
-            ></ws-input>
+            ></ws-input> -->
+            {{deptBudgetList.shipNo}}
           </ws-form-item>
         <!-- 类型 -->
-        <ws-form-item label="类型" span="1" prop="impurity" class="siji">
-          <ws-select
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="类型" span="1" prop="tranType" class="siji">
+          <!-- <ws-select
+          v-model="deptBudgetList.tranType"
           placeholder=""
           size="small"
-          ></ws-select>
+          ></ws-select> -->
+          {{deptBudgetList.tranType}}
         </ws-form-item>
-        <ws-form-item label="数量" span="1" prop="impurity" class="siji">
-          <ws-input
-          v-model="deptBudgetList.impurity"
+        <ws-form-item label="数量" span="1" prop="boxNumber" class="siji">
+          <!-- <ws-input
+          v-model="deptBudgetList.boxNumber"
           placeholder="请输入数量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.boxNumber}}
         </ws-form-item>
         </ws-info-table>
         </div>
@@ -319,19 +335,21 @@
         >
      <ws-info-table>
         <ws-form-item :label="'仓位号1-'+ (index+1)" span="1" prop="impurity" class="bot">
-            <ws-input
+            <!-- <ws-input
           v-model="deptBudgetList.impurity"
           placeholder="请输入仓位号"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.impurity}}
           </ws-form-item>
           <!-- 重量（吨） -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
-          <ws-input
+          <!-- <ws-input
           v-model="deptBudgetList.impurity"
           placeholder="请输入装仓重量"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+          {{deptBudgetList.positionWeight}}
         </ws-form-item>
         
      </ws-info-table>
@@ -344,14 +362,14 @@
             alt=""
           />
       </div>
-      <el-button
+      <!-- <el-button
           class="add"
           type="primary"
           size="small"
           @click="add()"
           >添加仓位</el-button
-        >
-      <div style="text-align: right; padding: 10px">
+        > -->
+      <!-- <div style="text-align: right; padding: 10px">
         
         <el-button
           class="bg-bottom-up"
@@ -360,7 +378,7 @@
           @click="submit()"
           >提交</el-button
         >
-      </div>
+      </div> -->
       </div>
     </ws-form>
     </div>
@@ -544,26 +562,26 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      // 货名
-      pullDown({ constId: 'CON2' })
-        .toPromise()
-        .then((response) => {
-          this.goodnameList = response
-        })
-      // 品级
-      pullDown({ constId: 'CON3' })
-        .toPromise()
-        .then((response) => {
-          this.gradeList = response
-        })
-      // 类型
-      pullDown({ constId: 'CON5' })
-        .toPromise()
-        .then((response) => {
-          this.storageType = response
-        })
-    },
+    // getList() {
+    //   // 货名
+    //   pullDown({ constId: 'CON2' })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.goodnameList = response
+    //     })
+    //   // 品级
+    //   pullDown({ constId: 'CON3' })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.gradeList = response
+    //     })
+    //   // 类型
+    //   pullDown({ constId: 'CON5' })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.storageType = response
+    //     })
+    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -0,0 +1,809 @@
+//反馈
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="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()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
+      <div class="small-title">任务详情</div>
+      <ws-info-table>
+        <!--任务编号-->
+        <ws-form-item label="任务编号" span="1" prop="processNo">
+          {{ deptBudgetList.processNo }}
+        </ws-form-item>
+        <!--货名-->
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          {{ deptBudgetList.goodsName }}
+        </ws-form-item>
+        <!--重量（吨）-->
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <!--发货地址-->
+        <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
+        </ws-form-item>
+        <!--发货人-->
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
+          {{ deptBudgetList.sender }}
+        </ws-form-item>
+        <!--发货人电话-->
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          {{ deptBudgetList.senderPhone }}
+        </ws-form-item>
+        <!--收货地址-->
+        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
+        </ws-form-item>
+        <!--收货人-->
+        <ws-form-item label="收货人" span="1" prop="receiver">
+          {{ deptBudgetList.receiver }}
+        </ws-form-item>
+        <!--收货人电话-->
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          {{ deptBudgetList.receiverPhone }}
+        </ws-form-item>
+        <!--发货日期-->
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <!--最晚到货日期-->
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <!-- 运输方式 -->
+        <ws-form-item label="运输方式" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="small-title">装车详情</div>
+      <div class="liaison">
+        <ws-info-table>
+          <div
+            style="width: 100%"
+            class="flex position"
+            v-for="(item, index) in freightspace"
+          >
+            <!--司机-->
+            <ws-form-item :label="'司机'+(index+1)" span="1" prop="driver">
+              <el-select
+                v-model="deptBudgetList.tranCarInfoList[0].driver"
+                placeholder="请选择司机"
+                filterable
+                :filter-method="dataFilter"
+                @change="selectstaff"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.staffName"
+                  :value="item.staffName"
+                />
+              </el-select>
+            </ws-form-item>
+            <!--电话-->
+            <ws-form-item label="司机电话" span="1" prop="driverPhone">
+              <ws-input
+                v-model="deptBudgetList.driverPhone"
+                placeholder="请输入司机电话"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--车牌号-->
+            <ws-form-item label="车牌号" span="1" prop="sendDateStart">
+               <ws-input
+                v-model="deptBudgetList.driverPhone"
+                placeholder="请输入司机电话"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--装车净重-->
+            <ws-form-item label="装车净重" span="1" prop="receiveDateEnd">
+              <ws-input
+                v-model="deptBudgetList.driverPhone"
+                placeholder="请输入司机电话"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--车型-->
+            <ws-form-item label="车型" span="1" prop="carModel">
+              <ws-select
+                v-model="deptBudgetList.carModel"
+                placeholder="请输入车型"
+                class="typeselect"
+              >
+                <ws-option
+                  v-for="item in carModel"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+            />
+          </div>
+        </ws-info-table>
+      </div>
+      <el-button class="add bg-bottom" type="primary" size="small" @click="add"
+        >添加车厢</el-button
+      >
+    </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
+      >
+    </div>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, dispatchCat, packList } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      staffList: [],
+      deptBudgetList: {
+        totalStorage: 0,
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      tranType: 2,
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
+      appendixIdsAdd: '',
+      size: 10,
+      value1: '',
+      unitList: [],
+      freightspace: [
+        {
+          trainNo: '',
+        },
+      ],
+      name: '',
+
+      staffList: [],
+      options: [],
+      carModel: [],
+      tranCarInfoList: {},
+      arr: [],
+    }
+  },
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+  },
+  methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        this.options = this.staffList.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
+    selectstaff(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    add() {
+      this.freightspace.push({
+        trainNo: '',
+      })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    //下拉司机姓名改变事件
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementTransporTationFire' })
+    },
+    // confirmPosition() {
+    //   this.draggable = false
+    // },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    submit() {
+      this.$confirm(`提交成功后，任务将下发给相关人员，是否确定提交?`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              for (var i = 0; i < this.freightspace.length; i++) {
+                var num = this.freightspace[i].trainNo
+                this.arr.push(num)
+              }
+              this.deptBudgetList.totalStorage = this.totalStorage
+
+              this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.sendDateStart =
+                this.deptBudgetList.sendDateStart
+              this.tranCarInfoList.receiveDateEnd =
+                this.deptBudgetList.receiveDateEnd
+              this.tranCarInfoList.carModel = this.deptBudgetList.carModel
+              this.tranCarInfoList.tranType = this.tranType
+              this.tranCarInfoList.boxNo = this.arr.toString()
+              var tranCarInfo = {}
+              var tranList = [this.tranCarInfoList]
+              tranCarInfo.id = this.deptBudgetList.id
+              tranCarInfo.infoId = this.deptBudgetList.infoId
+              tranCarInfo.tranCarInfoList = tranList
+              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+              dispatchCat(tranCarInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporTationFire',
+                  })
+                })
+            } else {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+        })
+      //司机姓名下拉
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+        })
+      //车型
+      packList({ constId: 'TRAN5' })
+        .toPromise()
+        .then((response) => {
+          this.carModel = response
+        })
+    },
+    handleExamine() {},
+    approve() {},
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    // 编辑
+    editClick(item, index) {
+      const map = JSON.parse(JSON.stringify(item))
+      if (Object.is(item.id, 1)) {
+        return
+      }
+      if (Object.is(this.unitList[index].flag, 'delete')) {
+        map.flag = 'check'
+        this.$set(this.unitList, index, map)
+      } else {
+        map.flag = 'delete'
+        this.$set(this.unitList, index, map)
+      }
+    },
+    // 删除
+    deleteClick(item, index) {
+      if (Object.is(item.constKey, 1)) {
+        return
+      }
+      if (!item.constValue) {
+        this.unitList.splice(index, 1)
+        return
+      }
+      delxiala({ id: this.unitList[index].id })
+        .toPromise()
+        .then((response) => {
+          this.getUnitList()
+          this.pleaseChoose = ''
+        })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+
+.del {
+  position: absolute;
+  right: -38px;
+  top: 9px;
+  cursor: pointer;
+}
+.del {
+  right: 0;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+}
+//联络员及车次
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 25%;
+}
+/deep/.liaison .flex {
+  display: contents;
+}
+</style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -256,33 +256,27 @@ export default {
     //查看火运调度详细
     trainSee(row) {
       this.$router.push({
-        path: 'tranManagementTransporTrainDetails',
-        query: {
-          id: row.id,
-        },
+        
       })
     },
     //反馈
     feedback(row) {
       this.$router.push({
         path: 'tranManagementTransporFeedback',
-        query: {
-          id: row.id,
-        },
       })
     },
 
-    //查看
+    //已完成
     handleLook() {
-      this.$router.push({ path: 'tranManagementVehicleLook' })
+      
     },
-    //添加
+    //待完成
     handleAdd() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
+      
     },
-    //编辑
+    //全部任务
     handleEdit() {
-      this.$router.push({ path: 'tranManagementTransportEdit' })
+      
     },
 
     dateFormat(fmt, date) {

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -3,23 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button
-          class="but"
-          type="primary"
-          @click="handleAdd()"
-        >
+        <ws-button class="but" type="primary" @click="handleAdd()">
           执行中</ws-button
         >
-        <ws-button
-          class="but"
-          @click="handleLook()"
-          >已完成</ws-button
-        >
-        <ws-button
-          class="but"
-          @click="handleEdit()"
-          >全部任务</ws-button
-        >
+        <ws-button class="but" @click="handleLook()">已完成</ws-button>
+        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
@@ -45,10 +33,7 @@
           class="findValue"
         ></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
+        <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
             height="16"
@@ -70,26 +55,26 @@
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-      <el-table-column type="index" label="序号" width="80" >
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
+        <el-table-column type="index" label="序号" width="80">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="processNo" label="运输任务编号" width="120">
         </el-table-column>
-           <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="goodsName" label="货名" width="80">
         </el-table-column>
-           <el-table-column prop="weight" label="重量（吨）" width="120">
+        <el-table-column prop="weight" label="重量（吨）" width="120">
         </el-table-column>
-           <el-table-column prop="send" label="发货" width="160">
+        <el-table-column prop="send" label="发货" width="160">
         </el-table-column>
-           <el-table-column prop="receive" label="收货" width="160">
+        <el-table-column prop="receive" label="收货" width="160">
         </el-table-column>
-           <el-table-column prop="tranCycle" label="运输周期" width="160">
-              <template scope="scope">
-               {{scope.row.deliveryDateStart}} ~ {{scope.row.deliveryDateEnd}}
-             </template>
+        <el-table-column prop="tranCycle" label="运输周期" width="160">
+          <template scope="scope">
+            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+          </template>
         </el-table-column>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
@@ -147,30 +132,20 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button
-              class="completed"
-              @click="trainSee(scope.row)"
-             
-            >
+            <ws-button class="completed" @click="trainSee(scope.row)">
               查看
             </ws-button>
-            <ws-button
-              class="putstorage"
-              @click="trainNumber(scope.row)"  
-            >
+            <ws-button class="putstorage" @click="trainNumber(scope.row)">
               车次
             </ws-button>
           </template>
         </el-table-column>
- 
       </el-table>
     </div>
   </div>
 </template>
 <script>
-import {
- automobileList,
-} from '@/model/transport/index'
+import { automobileList } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -265,33 +240,27 @@ export default {
     trainSee(row) {
       this.$router.push({
         path: 'tranManagementTransporTrainDetails',
-        query:{
-          id:row.id
-        }
+        query: {
+          id: row.id,
+        },
       })
     },
     //车次
     trainNumber(row) {
       this.$router.push({
         path: 'tranManagementTransporTrainNo',
-        query:{
-          id : row.id
-        }
+        query: {
+          id: row.id,
+        },
       })
     },
-   
-    //查看
-    handleLook() {
-      this.$router.push({ path: 'tranManagementVehicleLook' })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
-    },
-    //编辑
-    handleEdit() {
-      this.$router.push({ path: 'tranManagementTransportEdit' })
-    },
+
+    //执行中
+    handleLook() {},
+    //已完成
+    handleAdd() {},
+    //全部任务
+    handleEdit() {},
 
     dateFormat(fmt, date) {
       let ret
@@ -328,13 +297,13 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-     getList() {
+    getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        tranTypeKey:this.tranTypeKey
+        tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
         .then((response) => {

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -42,18 +42,8 @@
         <ws-form-item label="重量（吨）" span="1" prop="weight">
           {{deptBudgetList.weight}}
         </ws-form-item>
-
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
-          <!-- <el-cascader
-            :options="options_"
-            v-model="deptBudgetList.sendDetailedAddress"
-            clearable
-            size="large"
-            placeholder="请选择发货地址"
-            style="width: 200%"
-            @change="handleChange"
-          /> -->
            {{deptBudgetList.sendPrivate}}{{deptBudgetList.sendCity}}{{deptBudgetList.sendArea}}
         </ws-form-item>
 
@@ -68,15 +58,6 @@
         </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
-          <!-- <el-cascader
-            :options="options_"
-            v-model="deptBudgetList.receiveDetailedAddress"
-            clearable
-            size="large"
-            placeholder="请选择发货地址"
-            style="width: 200%"
-            @change="handleChange"
-          /> -->
            {{deptBudgetList.receivePrivate}}{{deptBudgetList.receiveCity}}{{deptBudgetList.receiveArea}}
         </ws-form-item>
         <!--收货人-->
@@ -89,22 +70,10 @@
         </ws-form-item>
         <!--发货日期-->
         <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          <!-- <ws-date-picker
-            v-model="deptBudgetList.deliveryDateStart"
-            type="date"
-            placeholder="请选择发货日期"
-            value-format="yyyy-MM-dd"
-          /> -->
           {{deptBudgetList.deliveryDateStart}}
         </ws-form-item>
         <!--最晚到货日期-->
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          <!-- <ws-date-picker
-            v-model="deptBudgetList.deliveryDateEnd"
-            type="date"
-            placeholder="请选择最晚到货日期"
-            value-format="yyyy-MM-dd"
-          /> -->
           {{deptBudgetList.deliveryDateEnd}}
         </ws-form-item>
         <!--合同编号-->
@@ -118,7 +87,7 @@
         <!--姓名-->
         <ws-form-item label="姓名" span="1" prop="driver">
           <el-select
-            v-model="deptBudgetList.driver"
+            v-model="this.deptBudgetList.tranCarInfoList[0].driver"
             placeholder="请选择姓名"
             filterable
             :filter-method="dataFilter"
@@ -131,11 +100,12 @@
               :value="item.staffName"
             />
           </el-select>
+        
         </ws-form-item>
         <!--电话-->
         <ws-form-item label="电话" span="1" prop="driverPhone">
           <ws-input
-            v-model="deptBudgetList.driverPhone"
+            v-model="this.deptBudgetList.tranCarInfoList[0].driverPhone"
             placeholder="请输入电话"
             maxlength="20"
             size="small"
@@ -144,7 +114,7 @@
         <!--发车日期-->
         <ws-form-item label="发车日期" span="1" prop="sendDateStart">
           <ws-date-picker
-            v-model="deptBudgetList.sendDateStart"
+            v-model="this.deptBudgetList.tranCarInfoList[0].sendDateStart"
             type="date"
             placeholder="请选择发货日期"
             value-format="yyyy-MM-dd"
@@ -153,7 +123,7 @@
         <!--到站日期-->
         <ws-form-item label="到站日期" span="1" prop="receiveDateEnd">
           <ws-date-picker
-            v-model="deptBudgetList.receiveDateEnd"
+            v-model="this.deptBudgetList.tranCarInfoList[0].receiveDateEnd"
             type="date"
             placeholder="请选择发货日期"
             value-format="yyyy-MM-dd"
@@ -162,7 +132,7 @@
         <!--车型-->
         <ws-form-item label="车型" span="1" prop="carModel">
           <ws-select
-            v-model="deptBudgetList.carModel"
+            v-model="this.deptBudgetList.tranCarInfoList[0].carModel"
             placeholder="请输入车型"
             class="typeselect"
           >
@@ -316,7 +286,6 @@ export default {
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
-        console.log(val)
         this.options = this.staffList.filter((item) => {
           if (
             !!~item.staffName.indexOf(val) ||
@@ -395,8 +364,8 @@ export default {
                 this.arr.push(
                   num  
                 )
-                 console.log(num )
               }
+              console.log(this.tranCarInfoList.boxNo = this.arr.toString())
               this.deptBudgetList.totalStorage = this.totalStorage
 
               this.tranCarInfoList.driver = this.deptBudgetList.driver