前端gjy

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

@@ -13,21 +13,21 @@ const tranManagementRouter = {
   },
   children: [
     //运输任务
-    // {
-    //   path: 'tranManagementTransport',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
-    //   name: 'tranManagementTransport',
-    //   meta: {
-    //     title: 'tranManagementTransport',
-    //     shortcutEntrance: 'tranManagement',
-    //     module: 'tranManagement.tranManagementDriver.tranManagementTransport',
-    //     permissicon: [],
-    //     keepAlive: true
-    //   },
+    {
+      path: 'tranManagementTransport',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementTransport'),
+      name: 'tranManagementTransport',
+      meta: {
+        title: 'tranManagementTransport',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementTransport',
+        permissicon: [],
+        keepAlive: true
+      },
 
-    //   // hidden: true
-    // },
+      // hidden: true
+    },
     //火运调度
     {
       path: 'tranManagementTransporTationFire',

src/views/tranManagement/tranManagementTransport.vue

@@ -2,60 +2,30 @@
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="20">
-     <template slot="right">
-        <ws-button
-        class="but"
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
+      <template slot="right">
+        <ws-button class="but" type="primary" @click="handleAdd()"
           >添加</ws-button
         >
       </template>
       <template slot="left">
-        <ws-button
-        class="but"
-          type="primary"
-          @click="handle()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >
+        <ws-button class="but" type="primary" @click="handle()">
           执行中</ws-button
         >
-        <ws-button
-        class="but"
-          @click="handleLook()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >已完成</ws-button
-        >
-        <ws-button
-        class="but"
-          @click="handleEdit()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >全部任务</ws-button
-        >
-        
+        <ws-button class="but" @click="handleLook()">已完成</ws-button>
+        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
       </template>
       <template slot="left">
-          <ws-input
+        <ws-input
           label="起点"
-         
           placeholder="请输入起点"
           clearable
           maxlength="200"
           type="input"
           class="find"
         ></ws-input>
-        
+
         <ws-input
-        label="终点"
-          
+          label="终点"
           placeholder="请输入终点"
           clearable
           maxlength="200"
@@ -72,27 +42,20 @@
         ></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <div class="search">
-            <ws-button
-          class="find"
-          type="primary"
-          @click="lookUp()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          ><img
-            width="16"
-            height="16"
-            style="
-              vertical-align: text-top;
-              position: relative;
-              top: 0px;
-              left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+          <ws-button class="find" type="primary" @click="lookUp()"
+            ><img
+              width="16"
+              height="16"
+              style="
+                vertical-align: text-top;
+                position: relative;
+                top: 0px;
+                left: -8px;
+              "
+              src="../../../public/img/sousuo.png"
+              alt=""
+          /></ws-button>
         </div>
-        
       </template>
     </BaseHeaderLayout>
     <div>
@@ -115,7 +78,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop=" weight" class="table_td" label="货物（吨数）" >
+        <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
           <!-- <template slot-scope="scope">
             <div
               style="height: 24px"
@@ -145,7 +108,11 @@
             </div>
           </template> -->
         </el-table-column>
-        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
+        <el-table-column
+          prop="currentTransferAddress"
+          class="table_td"
+          label="当前中转"
+        >
           <!-- <template slot-scope="scope">
             <div
               style="height: 24px"
@@ -157,7 +124,7 @@
         </el-table-column>
         <el-table-column prop="end" class="table_td" label="终点">
           <!-- <template slot-scope="scope"> -->
-            <!-- <div
+          <!-- <div
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
@@ -166,59 +133,58 @@
           <!-- </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>
-            <span slot="reference">
-              <span
-              v-if="scope.row.status =='待执行'"
-              class="executory"
-              ></span>
-            <span
-            v-if="scope.row.status == '执行中'"
-            class="inExecution"
-            ></span>
-            <span v-if="scope.row.status == '已完成'" class="done"></span
-            >{{scope.row.status}}
-            </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 }}
+        <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.status == '待执行'"
+                    class="executory"
+                  ></span>
+                  <span
+                    v-if="scope.row.status == '执行中'"
+                    class="inExecution"
+                  ></span>
+                  <span v-if="scope.row.status == '已完成'" class="done"></span
+                  >{{ scope.row.status }}
+                </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>
                 </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-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">
             <ws-button
@@ -261,9 +227,7 @@
   </div>
 </template>
 <script>
-import {
-  gain,
-} from '@/model/transport/index'
+import { gain } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -296,7 +260,7 @@ export default {
       showType: true,
       // 年
       year: '',
-     gainList:[],
+      gainList: [],
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
@@ -320,32 +284,31 @@ export default {
     }
   },
   activated() {
-    
     this.getList()
     this.showType = this.isShow
   },
   methods: {
     //添加
-    add(){
-      this.$router.push({ path :'tranManagementTransportAdd'})
+    add() {
+      this.$router.push({ path: 'tranManagementTransportAdd' })
     },
     //查找
-      lookUp(){
-        this.currentPage= 1
-        this.getList()
-      },
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
     getList() {
       gain({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage:this.currentPage,
-        pageSize:this.pageSize,
-        searchType:this.searchType,
-        searchKeyWord:this.searchKeyWord,
-      })
-      .toPromise()
-      .then((response)=>{
-        this.gainList = response
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchType: this.searchType,
+        searchKeyWord: this.searchKeyWord,
       })
+        .toPromise()
+        .then((response) => {
+          this.gainList = response
+        })
     },
     //编辑
     delivery(item) {
@@ -373,7 +336,7 @@ export default {
           positionId: item.binNumberId,
           warehouseName: item.warehouseName,
           binNumber: item.binNumber,
-          capacity:item.capacity - free ,
+          capacity: item.capacity - free,
         },
       })
     },
@@ -644,25 +607,24 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-.el-row{
-    height: 150px;
+.el-row {
+  height: 150px;
 }
-.base_header_layout .grid-content{
-    margin-top: 80px;
+.base_header_layout .grid-content {
+  margin-top: 80px;
 }
-.but{
-    margin-top: 150px;
+.but {
+  margin-top: 150px;
 }
-.findValue{
-    width: 50%;
-    margin-left: 25%;
+.findValue {
+  width: 50%;
+  margin-left: 25%;
 }
-/deep/.el-input--small .el-input__inner{
+/deep/.el-input--small .el-input__inner {
   margin-left: -230px;
-   width: 300px;
+  width: 300px;
 }
-.search{
+.search {
   margin-left: -100px;
 }
-
 </style>

src/views/tranManagement/tranManagementTransportAdd.vue

@@ -113,19 +113,15 @@
           </el-select>
         </div>
         <el-form-item label="始发地" span="1" class="start-address">
-          <el-select
-            v-model="deptBudgetList.contractNo"
-            placeholder="货名"
-            class="typeselect"
-            @change="selectstorageType"
-          >
-            <el-option
-              v-for="item in storageType"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            ></el-option>
-          </el-select>
+          <el-cascader
+            :options="options_"
+            v-model="selectedOptions"
+            clearable
+            size="large"
+            placeholder="请选择始发地"
+            style="width: 200%"
+            @change="handleChange"
+          />
         </el-form-item>
         <el-form-item
           label="始发地详细地址"
@@ -166,19 +162,15 @@
           prop="contractNo"
           class="start-address"
         >
-          <el-select
-            v-model="deptBudgetList.contractNo"
-            placeholder="货名"
-            class="typeselect"
-            @change="selectstorageType"
-          >
-            <el-option
-              v-for="item in storageType"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            ></el-option>
-          </el-select>
+          <el-cascader
+            :options="options_"
+            v-model="selectedOptions1"
+            clearable
+            size="large"
+            placeholder="请选择终到地"
+            style="width: 200%"
+            @change="handleChange1"
+          />
         </el-form-item>
         <el-form-item
           label="始发地详细地址"
@@ -359,7 +351,7 @@
 </template>
 <script>
 import { packList } from '@/model/contarct/index'
-import { provinceAndCityData, CodeToText } from 'element-china-area-data'
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { addTranTask } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -389,10 +381,11 @@ export default {
         driverPayeeInfo: {},
       },
       radio: '1',
-      options_: provinceAndCityData,
+      options_: regionData,
       heightData: '600px',
       zoom: 7,
       selectedOptions: [],
+      selectedOptions1: [],
       center: [116.244694, 39.517344],
       window: '',
       district: null,
@@ -428,15 +421,6 @@ export default {
   },
   computed: {},
   methods: {
-    getList() {
-      addtrantask({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.deptBudgetList = response
-        })
-    },
     // 获取当前年月日
     getdate() {
       var date = new Date()
@@ -474,6 +458,11 @@ export default {
         .then((response) => {
           this.goodnameList = response
         })
+      packList({ constId: 'TRAN3' })
+        .toPromise()
+        .then((response) => {
+          this.taskType = response
+        })
       // // 车型
       // packList({ constId: 'TRAN1' })
       //   .toPromise()
@@ -514,6 +503,9 @@ export default {
     handleChange(value) {
       this.selectedOptions = value
     },
+    handleChange1(value) {
+      this.selectedOptions1 = value
+    },
     returnsales() {
       this.$router.push({ path: 'tranManagementTransport' })
     },