凯合编号地点修改

src/api/kaihe/basicdata/container.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/cntr/' + fIds,
     method: 'delete'
   })
 }

src/api/kaihe/basicdata/portinformation.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/address/' + fIds,
     method: 'delete'
   })
 }

src/api/kaihe/basicdata/route.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/address/' + fIds,
     method: 'delete'
   })
 }
@@ -88,3 +88,11 @@ export function getyardName(query) {
     data: query
   })
 }
+
+export function getuserName(query) {
+  return request({
+    url: '/system/user/selectUserNameFO',
+    method: 'get',
+    data: query
+  })
+}

src/api/kaihe/basicdata/wharf.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/address/' + fIds,
     method: 'delete'
   })
 }

src/api/kaihe/basicdata/yard.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/address/' + fIds,
     method: 'delete'
   })
 }

src/api/kaihe/containerNews/boxDistribution.js

@@ -79,3 +79,11 @@ export function getyard(query) {
     params: query
   })
 }
+//查询地点
+export function getaddress(query) {
+  return request({
+    url: '/shipping/address/selectadress',
+    method: 'get',
+    params: query
+  })
+}

src/api/kaihe/containerNews/boxInformation.js

@@ -48,9 +48,9 @@ export function changeCorpsStatus(fId, fStatus) {
 }
 
 // 删除客户详情
-export function delCorps(fId) {
+export function delCorps(fIds) {
   return request({
-    url: '/shipping/route/' + fId,
+    url: '/shipping/cntrno/' + fIds,
     method: 'delete'
   })
 }
@@ -72,3 +72,11 @@ export function getType(query) {
     params: query
   })
 }
+//查询地点
+export function getaddress(query) {
+  return request({
+    url: '/shipping/address/selectadress',
+    method: 'get',
+    params: query
+  })
+}

src/api/kaihe/containerNews/historyBoxNews.js

@@ -64,10 +64,10 @@ export function exportCorps(query) {
   })
 }
 
-//查询港口名称
-export function getyard(query) {
+//查询地点
+export function getaddress(query) {
   return request({
-    url: '/shipping/address/selectStorageName',
+    url: '/shipping/address/selectadress',
     method: 'get',
     params: query
   })

src/api/kaihe/containerNews/modifyPage.js

@@ -74,3 +74,11 @@ export function getyard(query) {
     params: query
   })
 }
+//查询地点
+export function getaddress(query) {
+  return request({
+    url: '/shipping/address/selectadress',
+    method: 'get',
+    params: query
+  })
+}

src/views/kaihe/basicdata/container/index.vue

@@ -123,7 +123,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basicdata:container:add']"
+          v-hasPermi="['shipping:cntr:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -133,7 +133,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['basicdata:container:edit']"
+          v-hasPermi="['shipping:cntr:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -143,7 +143,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['basicdata:container:remove']"
+          v-hasPermi="['shipping:cntr:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -161,7 +161,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata:container:export']"
+          v-hasPermi="['shipping:cntr:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -217,14 +217,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:corps:edit']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:corps:remove']"
           >移除</el-button>
         </template>
       </el-table-column>
@@ -283,7 +281,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="编号" prop="fNo" label-width="100px">
-              <el-input v-model="form.fNo" :disabled="doNot" style="width: 80%" @blur="onlyNo" placeholder="请输入编号" />
+              <el-input v-model="form.fNo" :disabled="doNot" style="width: 80%" placeholder="请输入编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -295,7 +293,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="名称" prop="fName" label-width="100px">
-              <el-input v-model="form.fName" :disabled="doNot" style="width: 80%" @blur="onlyName" placeholder="请输入名称" />
+              <el-input v-model="form.fName" :disabled="doNot" style="width: 80%" placeholder="请输入名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -372,8 +370,6 @@
 
 <script>
   import { listCorps, getCorps, delCorps, addcontainer, getNo, getName, changeCorpsStatus,exportCorps } from "@/api/kaihe/basicdata/container";
-  import {queryUserVal} from "@/api/system/user";
-  import { isArray } from '@/utils/validate'
   import Vue from 'vue'
   import { getyardName, getyardNo } from '@/api/kaihe/basicdata/yard'
   Vue.directive('dialogDrag', {
@@ -538,20 +534,6 @@
       });
     },
     methods: {
-      //编号唯一
-      onlyNo(){
-        getNo(this.form.fNo).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fNo = ''})
-      },
-      //全称唯一
-      onlyName(){
-        getName(this.form.fName).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fName = ''})
-      },
       full(){
         this.dialogFull = !this.dialogFull
       },

src/views/kaihe/basicdata/portinformation/index.vue

@@ -141,7 +141,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basicdata:portinformation:add']"
+          v-hasPermi="['shipping:address:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -151,7 +151,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['basicdata:portinformation:edit']"
+          v-hasPermi="['shipping:address:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -161,7 +161,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['basicdata:portinformation:remove']"
+          v-hasPermi="['shipping:address:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -179,7 +179,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata:portinformation:export']"
+          v-hasPermi="['shipping:address:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -208,7 +208,7 @@
 <!--      />-->
       <el-table-column :show-overflow-tooltip="true" label="中文全称" align="center" width="100px" prop="fName" fixed/>
       <el-table-column :show-overflow-tooltip="true" label="英文全称" align="center" prop="fEname" fixed/>
-      <el-table-column :show-overflow-tooltip="true" label="航线" align="center" prop="fLaneid" fixed/>
+      <el-table-column :show-overflow-tooltip="true" label="航线" align="center" prop="portName" fixed/>
 
       <el-table-column label="UNCODE" align="center" prop="fUncode" />
       <el-table-column label="国家" align="center" prop="fCountry" />
@@ -235,14 +235,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:corps:edit']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:corps:remove']"
           >移除</el-button>
         </template>
       </el-table-column>
@@ -302,7 +300,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="港口编号" prop="fNo" label-width="90px">
-              <el-input v-model="form.fNo" style="width: 80%" placeholder="请输入港口编号" @blur="onlyNo" :disabled="doNot"/>
+              <el-input v-model="form.fNo" style="width: 80%" placeholder="请输入港口编号" :disabled="doNot"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -320,7 +318,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="港口全称" prop="fName" label-width="90px">
-              <el-input v-model="form.fName" style="width: 80%" placeholder="请输入英文名称" @blur="onlyName" :disabled="doNot"/>
+              <el-input v-model="form.fName" style="width: 80%" placeholder="请输入英文名称"  :disabled="doNot"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -567,30 +565,6 @@
       this.portRemoteMethod()
     },
     methods: {
-      //编号唯一
-      onlyNo(){
-        console.log(this.form.fNo)
-        let formData = {
-          fNo:this.form.fNo,
-          fTypes:this.form.fTypes
-        }
-        getyardNo(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fNo = ''})
-      },
-      //全称唯一
-      onlyName(){
-        console.log(this.form.fName)
-        let formData = {
-          fName:this.form.fName,
-          fTypes:this.form.fTypes
-        }
-        getyardName(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fName = ''})
-      },
       //模糊查询航线名称
       routeRemoteMethod(){
         let queryParams = { pageNum: 1,};

src/views/kaihe/basicdata/route/index.vue

@@ -22,14 +22,20 @@
           </el-form-item>
 
           <el-form-item label="管理员" prop="fManagerid">
-            <el-input
+            <el-select
               v-model="queryParams.fManagerid"
               style="width: 200px"
               placeholder="请输入管理员"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
-            />
+            >
+              <el-option
+                v-for="item in this.ManageridOptions"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userId"/>
+            </el-select>
           </el-form-item>
 
           <el-form-item label="状态" prop="fStatus">
@@ -83,7 +89,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basicdata:route:add']"
+          v-hasPermi="['shipping:address:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -93,7 +99,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['basicdata:route:edit']"
+          v-hasPermi="['shipping:address:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -103,7 +109,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['basicdata:route:remove']"
+          v-hasPermi="['shipping:address:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -121,7 +127,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata:route:export']"
+          v-hasPermi="['shipping:address:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -148,7 +154,7 @@
       <el-table-column label="中文全称" align="center" prop="fName" width="100px"/>
       <el-table-column :show-overflow-tooltip="true" label="英文全称" align="center" prop="fEname" width="100px"
       />
-      <el-table-column :show-overflow-tooltip="true" label="航线管理员" align="center" width="100px" prop="fManagerid" />
+      <el-table-column :show-overflow-tooltip="true" label="航线管理员" align="center" width="100px" prop="managerName" />
       <el-table-column :show-overflow-tooltip="true" label="联系方式" align="center" prop="fTel" />
       <el-table-column :show-overflow-tooltip="true" label="状态" align="center" prop="fStatus" />
 
@@ -172,14 +178,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:corps:edit']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:corps:remove']"
           >移除</el-button>
         </template>
       </el-table-column>
@@ -225,7 +229,6 @@
                 :multiple="true"
                 :disabled="doNot"
                 placeholder="请输入编号"
-                @blur="onlyNo"
               />
 
             </el-form-item>
@@ -245,7 +248,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="全称" prop="fName" label-width="90px">
-              <el-input v-model="form.fName" :disabled="doNot" style="width: 80%" placeholder="请输入全称" @blur="onlyName" />
+              <el-input v-model="form.fName" :disabled="doNot" style="width: 80%" placeholder="请输入全称" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -259,9 +262,17 @@
 
           <el-col :span="12">
             <el-form-item label="航线管理员" prop="fManagerid" label-width="90px">
-              <el-input v-model="form.fManagerid" :disabled="doNot" style="width: 80%" placeholder="请输入航线管理员">
-
-              </el-input>
+              <el-select
+                v-model="form.fManagerid"
+                :disabled="doNot" style="width: 80%"
+                placeholder="请输入航线管理员"
+              >
+                <el-option
+                  v-for="item in this.ManageridOptions"
+                  :key="item.userId"
+                  :label="item.userName"
+                  :value="item.userId"/>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -314,7 +325,7 @@
 </template>
 
 <script>
-  import { addroute,listCorps,getCorps,delCorps,getroute,getyardNo, getyardName,} from "@/api/kaihe/basicdata/route";
+  import { addroute,listCorps,getCorps,delCorps,getroute,getuserName, getyardName,} from "@/api/kaihe/basicdata/route";
   import {queryUserVal} from "@/api/system/user";
   import { isArray } from '@/utils/validate'
   import Vue from 'vue'
@@ -389,6 +400,10 @@
         routeOptions:[],
         //全屏放大
         dialogFull:false,
+        //弹窗弹出关闭
+        open:false,
+        //管理员下拉模糊查询
+        ManageridOptions:[],
 
 
 
@@ -451,31 +466,18 @@
         this.fTypesOptions = response.data;
       });
       this.routeRemoteMethod()
+      this.userRemoteMethod()
 
     },
     methods: {
-      //编号唯一
-      onlyNo(){
-        console.log(this.form.fNo)
-        let formData = {
-          fNo:this.form.fNo,
-          fTypes:this.form.fTypes
-        }
-        getyardNo(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fNo = ''})
-      },
-      //全称唯一
-      onlyName(){
-        let formData = {
-          fName:this.form.fName,
-          fTypes:this.form.fTypes
-        }
-        getyardName(formData).then(response =>{
+      //模糊查询管理员
+      userRemoteMethod(){
+        let queryParams = { pageNum: 1,};
+        getuserName(queryParams).then((response) => {
           console.log(response)
-        })
-          .catch(_ => {this.form.fName = ''})
+          this.ManageridOptions = response.rows;
+          console.log(this.routeOptions)
+        });
       },
       //模糊查询航线名称
       routeRemoteMethod(){

src/views/kaihe/basicdata/wharf/index.vue

@@ -100,7 +100,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basicdata:wharf:add']"
+          v-hasPermi="['shipping:address:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -110,7 +110,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['basicdata:wharf:edit']"
+          v-hasPermi="['shipping:address:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -120,7 +120,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['basicdata:wharf:remove']"
+          v-hasPermi="['shipping:address:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -138,7 +138,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata:wharf:export']"
+          v-hasPermi="['shipping:address:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -188,14 +188,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:corps:edit']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:corps:remove']"
           >移除</el-button>
         </template>
       </el-table-column>
@@ -256,12 +254,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="码头编号" prop="fNo">
-              <el-input v-model="form.fNo" style="width: 80%" @blur="onlyNo" placeholder="请输入编号" :disabled="doNot"/>
+              <el-input v-model="form.fNo" style="width: 80%" placeholder="请输入编号" :disabled="doNot"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="码头全称" prop="fName">
-              <el-input v-model="form.fName" @blur="onlyName" style="width: 78%" placeholder="请输入码头名称" :disabled="doNot"/>
+              <el-input v-model="form.fName" style="width: 78%" placeholder="请输入码头名称" :disabled="doNot"/>
             </el-form-item>
           </el-col>
 
@@ -452,29 +450,6 @@
       this.wharfRemoteMethod()
     },
     methods: {
-      //编号唯一
-      onlyNo(){
-        console.log(this.form.fNo)
-        let formData = {
-          fNo:this.form.fNo,
-          fTypes:this.form.fTypes
-        }
-        getyardNo(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fNo = ''})
-      },
-      //全称唯一
-      onlyName(){
-        let formData = {
-          fName:this.form.fName,
-          fTypes:this.form.fTypes
-        }
-        getyardName(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fName = ''})
-      },
       //模糊查询港口名称
       portRemoteMethod(){
         let queryParams = { pageNum: 1,};
@@ -491,13 +466,7 @@
           console.log(this.wharfOptions)
         });
       },
-      //模糊查询港口名称
-      // portRemoteMethod(){
-      //   let queryParams = { pageNum: 1,};
-      //   getportinformation(queryParams).then(response =>{
-      //     this.portNameOptions = response.rows
-      //   })
-      // },
+
       full(){
         this.dialogFull = !this.dialogFull
       },

src/views/kaihe/basicdata/yard/index.vue

@@ -99,7 +99,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basicdata:yard:add']"
+          v-hasPermi="['shipping:address:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -109,7 +109,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['basicdata:yard:edit']"
+          v-hasPermi="['shipping:address:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -119,7 +119,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['basicdata:yard:remove']"
+          v-hasPermi="['shipping:address:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -137,7 +137,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata:yard:export']"
+          v-hasPermi="['shipping:address:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -187,14 +187,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:corps:edit']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:corps:remove']"
           >移除</el-button>
         </template>
       </el-table-column>
@@ -260,7 +258,6 @@
                 style="width: 80%"
                 placeholder="请输入编号"
                 :disabled="doNot"
-                @blur="onlyNo"
               />
             </el-form-item>
           </el-col>
@@ -287,7 +284,6 @@
                 v-model="form.fName"
                 style="width: 80%"
                 placeholder="请输入全称"
-                @blur="onlyName"
                 :disabled="doNot"/>
             </el-form-item>
           </el-col>
@@ -476,29 +472,6 @@
       this.yardRemoteMethod()
     },
     methods: {
-      //编号唯一
-      onlyNo(){
-        console.log(this.form.fNo)
-        let formData = {
-          fNo:this.form.fNo,
-          fTypes:this.form.fTypes
-        }
-        getyardNo(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fNo = ''})
-      },
-      //全称唯一
-      onlyName(){
-        let formData = {
-          fName:this.form.fName,
-          fTypes:this.form.fTypes
-        }
-        getyardName(formData).then(response =>{
-          console.log(response)
-        })
-          .catch(_ => {this.form.fName = ''})
-      },
       //模糊查询航线名称
       yardRemoteMethod(){
         let queryParams = { pageNum: 1,};
@@ -597,21 +570,13 @@
       submitForm() {
         this.$refs["form"].validate(valid => {
           if (valid) {
-            if (this.form.fId != null) {
-              addyard(this.form).then(response => {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              });
-            } else {
               addyard(this.form).then(response => {
-                this.msgSuccess("新增成功");
+                this.msgSuccess("操作成功");
                 this.open = false;
                 this.getList();
-              });
+              })
             }
-          }
-        });
+          })
       },
       /** 删除按钮操作 */
       handleDelete(row) {

src/views/kaihe/containerNews/boxDistribution/index.vue

@@ -3,21 +3,36 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
           <el-form-item label="地点" prop="fUpdateaddress">
-            <el-input style="width: 240px" v-model="queryParams.fUpdateaddress" placeholder="请输入或选择地点" clearable size="small">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="箱型" prop="fNo">
-            <el-input
-              v-model="queryParams.fNo"
+            <el-select
               style="width: 240px"
-              placeholder="请输入箱号"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
+              v-model="queryParams.fUpdateaddress"
+              placeholder="请输入或选择地点"
+              clearable size="small"
+              filterable
+              :remote-method="addressMethod"
+            >
+              <el-option
+                v-for="item in this.addressOptions"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fName">
+                <span style="float: left;color: #8492a6; font-size: 13px">{{ item.typesName }}</span>
+                <span style="float: right;">{{ item.fName }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
 
+<!--          <el-form-item label="箱型" prop="fNo">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.fNo"-->
+<!--              style="width: 240px"-->
+<!--              placeholder="请输入箱号"-->
+<!--              clearable-->
+<!--              size="small"-->
+<!--              @keyup.enter.native="handleQuery"-->
+<!--            />-->
+<!--          </el-form-item>-->
+
       </el-row>
     </el-form>
 
@@ -52,7 +67,7 @@
 </template>
 
 <script>
-  import { listCorps, listName, getCorps, delCorps, changeCorpsStatus,exportCorps } from "@/api/kaihe/containerNews/boxDistribution";
+  import { listCorps, listName, getaddress, delCorps, changeCorpsStatus,exportCorps } from "@/api/kaihe/containerNews/boxDistribution";
   export default {
     name: "boxDistribution",
     components: {
@@ -61,6 +76,8 @@
       return {
         //标签名
         boxDistributionName:[],
+        //模糊下拉查询地点
+        addressOptions:[],
 
         contactList:[],
         // 遮罩层
@@ -87,28 +104,37 @@
     },
     created() {
       this.getList();
-
+      this.addressMethod()
     },
     activated() {
       this.getList()
     },
     methods: {
+      //模糊查询地点
+      addressMethod(){
+        let queryParams = { pageNum: 1,};
+        getaddress(queryParams).then(response=>{
+          this.addressOptions = response.rows
+          console.log(response)
+        })
+      },
+      //点击列表传值跳转
       modiEy(row, column, cell, event){
         let res = {}
         if(column.label =='空' || column.label =='重'){
            res = {
             updateEFName:column.label,
-            fUpdateaddress:row["地点"]
+             addressName:row["地点"]
           }
         }else if(column.label =='好' || column.label =='坏'){
            res = {
             cntrstatusName:column.label,
-            fUpdateaddress:row["地点"]
+             addressName:row["地点"]
           }
         }else{
            res = {
             typeidName:column.label,
-            fUpdateaddress:row["地点"]
+             addressName:row["地点"]
           }
         }
         if(row[column.label] != 0){

src/views/kaihe/containerNews/boxInformation/index.vue

@@ -110,6 +110,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
+          v-hasPermi="['shipping:cntrno:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -119,6 +120,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
+          v-hasPermi="['shipping:cntrno:updateTCntrno']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -128,6 +130,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
+          v-hasPermi="['shipping:cntrno:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -165,8 +168,8 @@
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection"  align="center" />
       <el-table-column type="index"  label="行号" align="center" fixed/>
-      <el-table-column label="箱号" sortable fixed align="center" prop="fNo" fixed width="100px"/>
-      <el-table-column label="地点" align="center"  sortable  prop="fUpdateaddress" fixed/>
+      <el-table-column label="箱号" sortable fixed align="center" prop="fNo" fixed width="120px"/>
+      <el-table-column label="地点" align="center"  sortable  prop="addressName" fixed/>
       <el-table-column label="箱类型" align="center" sortable  prop="typeidName" fixed width="100px"/>
       <el-table-column label="箱状态" align="center" sortable  prop="cntrstatusName" fixed width="100px"/>
       <el-table-column label="空重" align="center" sortable  prop="updateEFName" fixed/>
@@ -193,14 +196,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['basicdata:corps:edit']"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['basicdata:corps:remove']"
           >移除</el-button>
         </template>
       </el-table-column>
@@ -260,7 +261,23 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="最新地点" prop="fUpdateaddress">
-              <el-input v-model="form.fUpdateaddress" style="width: 80%" placeholder="请输入最新地点" :disabled="doNot"/>
+              <el-select
+                v-model="form.fUpdateaddress"
+                style="width: 80%"
+                placeholder="请输入最新地点"
+                :disabled="doNot"
+                filterable
+                :remote-method="addressMethod"
+              >
+                <el-option
+                  v-for="item in this.addressOptions"
+                  :key="item.fId"
+                  :label="item.fName"
+                  :value="item.fId">
+                  <span style="float: left; color: #8492a6; font-size: 13px">{{ item.typesName }}</span>
+                  <span style="float: right;">{{ item.fName }}</span>
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -356,7 +373,7 @@
 </template>
 
 <script>
-  import { listCorps, getInforma, delCorps, addboxinformation, getType,updateCorps, changeCorpsStatus,exportCorps } from "@/api/kaihe/containerNews/boxInformation";
+  import { listCorps, getInforma, delCorps, addboxinformation, getType,getaddress, changeCorpsStatus,exportCorps } from "@/api/kaihe/containerNews/boxInformation";
   import {queryUserVal} from "@/api/system/user";
   import { isArray } from '@/utils/validate'
   import Vue from 'vue'
@@ -440,6 +457,8 @@
         typeOptions:[],
         //查看置灰
         doNot:true,
+        //模糊下拉查询地点
+        addressOptions:[],
 
         //全屏放大
         dialogFull:false,
@@ -538,8 +557,17 @@
         this.cntrstatusOptions = response.data;
       });
       this.boxTypeMethod()
+      this.addressMethod()
     },
     methods: {
+      //模糊查询地点
+      addressMethod(){
+        let queryParams = { pageNum: 1,};
+        getaddress(queryParams).then(response=>{
+          this.addressOptions = response.rows
+          console.log(response)
+        })
+      },
       //模糊查询箱类型
       boxTypeMethod(){
         let queryParams = { pageNum: 1,};
@@ -639,8 +667,12 @@
         this.doNot = true
         this.reset();
         const fId = row.fId || this.ids
+
         getInforma(fId).then(response => {
           this.form = response.data;
+          console.log(response.data)
+          console.log(this.form)
+          this.form.fUpdateaddress = response.data.addressName
           this.open = true;
           this.title = "修改客户详情";
         });
@@ -650,6 +682,7 @@
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.fId != null) {
+              console.log("111")
               addboxinformation(this.form).then(response => {
                 this.msgSuccess("修改成功");
                 this.open = false;

src/views/kaihe/containerNews/historyBoxNews/index.vue

@@ -13,8 +13,24 @@
           />
         </el-form-item>
           <el-form-item label="地点" prop="fUpdateaddress">
-            <el-input style="width: 240px" v-model="queryParams.fUpdateaddress" placeholder="请输入地点" clearable size="small">
-            </el-input>
+            <el-select
+              style="width: 240px"
+              v-model="queryParams.fUpdateaddress"
+              placeholder="请输入地点"
+              clearable
+              size="small"
+              filterable
+              :remote-method="addressMethod"
+            >
+              <el-option
+                v-for="item in this.addressOptions"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId">
+                <span style="float: left; color: #8492a6; font-size: 13px">{{ item.typesName }}</span>
+                <span style="float: right;">{{ item.fName }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
       </el-row>
     </el-form>
@@ -28,9 +44,9 @@
     <el-table v-loading="loading" :data="corpsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" width="55" label="行号" align="center" />
-      <el-table-column :show-overflow-tooltip="true" label="提单号" align="center" prop="fMblno" width="100px"/>
-      <el-table-column :show-overflow-tooltip="true" label="箱号" align="center" prop="fNo" width="100px"/>
-      <el-table-column label="铅封号" align="center" prop="" width="100px"/>
+      <el-table-column :show-overflow-tooltip="true" label="提单号" align="center" prop="fMblno" width="120px"/>
+      <el-table-column :show-overflow-tooltip="true" label="箱号" align="center" prop="fNo" width="120px"/>
+      <el-table-column label="铅封号" align="center" prop="" width="120px"/>
       <el-table-column :show-overflow-tooltip="true" label="箱型" align="center" prop="typeidName" width="100px"
       />
       <el-table-column :show-overflow-tooltip="true" label="尺寸" align="center" width="100px" prop="cntrsizeName" />
@@ -56,10 +72,8 @@
 </template>
 
 <script>
-  import { listCorps, getCorps, delCorps, addCorps, updateCorps, changeCorpsStatus,exportCorps } from "@/api/kaihe/containerNews/historyBoxNews";
-  import {queryUserVal} from "@/api/system/user";
-  import { isArray } from '@/utils/validate'
-  import Vue from 'vue'
+  import { listCorps, getaddress } from "@/api/kaihe/containerNews/historyBoxNews";
+
   export default {
     name: "historyBoxNews",
     components: {
@@ -68,6 +82,8 @@
       return {
         //默认显示第一行
         queryParamsHidden:false,
+        //模糊下拉查询地点
+        addressOptions:[],
 
         //全屏放大
         dialogFull:false,
@@ -97,11 +113,16 @@
     },
     created() {
       this.getList();
-
+      this.addressMethod()
     },
     methods: {
-      full(){
-        this.dialogFull = !this.dialogFull
+      //模糊查询地点
+      addressMethod(){
+        let queryParams = { pageNum: 1,};
+        getaddress(queryParams).then(response=>{
+          this.addressOptions = response.rows
+          console.log(response)
+        })
       },
       /** 查询客户详情列表 */
       getList() {

src/views/kaihe/containerNews/modifyPage/index.vue

@@ -3,13 +3,25 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-row>
           <el-form-item label="地点" prop="fUpdateaddress">
-            <el-input
+            <el-select
               style="width: 240px"
               v-model="queryParams.fUpdateaddress"
               placeholder="请输入调入地点"
               clearable
               @input="bringIn"
-              size="small"/>
+              size="small"
+              filterable
+              :remote-method="addressMethod"
+              >
+              <el-option
+                v-for="item in this.addressOptions"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId">
+                <span style="float: left; color: #8492a6; font-size: 13px">{{ item.typesName }}</span>
+                <span style="float: right;">{{ item.fName }}</span>
+              </el-option>
+            </el-select>
           </el-form-item>
 
           <el-form-item label="空重" prop="fUpdateEF">
@@ -75,7 +87,7 @@
       />
       <el-table-column :show-overflow-tooltip="true" label="箱主" align="center" width="100px" prop="ownerName" />
       <el-table-column :show-overflow-tooltip="true" label="原时间" align="center" prop="fUpdatetime" />
-      <el-table-column :show-overflow-tooltip="true" label="原地点" align="center" prop="fUpdateaddress" />
+      <el-table-column :show-overflow-tooltip="true" label="原地点" align="center" prop="addressName" />
 
       <el-table-column label="原空重" align="center" prop="updateEFName" />
       <el-table-column label="原状态" align="center" prop="cntrstatusName" width="100"/>
@@ -100,13 +112,16 @@
 </template>
 
 <script>
-  import { listCorps, addmodify } from "@/api/kaihe/containerNews/modifyPage";
+  import { listCorps, addmodify,getaddress} from "@/api/kaihe/containerNews/modifyPage";
+  import Global from '@/layout/components/global'
   export default {
     name: "boxDistribution",
     components: {
     },
     data() {
       return {
+        //模糊下拉查询地点
+        addressOptions:[],
         //空重字典表
         updateEFOptions:[],
         //状态字典表
@@ -151,10 +166,18 @@
       this.getDicts("f_cntrstatus").then(response => {
         this.cntrstatusOptions = response.data;
       });
-
+      this.addressMethod()
     },
 
     methods: {
+      //模糊查询地点
+      addressMethod(){
+        let queryParams = { pageNum: 1,};
+        getaddress(queryParams).then(response=>{
+          this.addressOptions = response.rows
+          console.log(response)
+        })
+      },
       //提交修改数据
       determine(){
         let data = []
@@ -182,7 +205,7 @@
         }
           data.push({
             fId: this.select[item].fId,
-            foldSite: this.select[item].foldSite,
+            foldSite: this.select[item].fold,
             foldFUpdateef: this.select[item].FUpdateef,
             foldFCntrstatus: this.select[item].FCntrstatus,
             foldtime: this.select[item].foldtime,
@@ -194,16 +217,40 @@
         let tCntrno = data
         listCorps(tCntrno).then(response =>{
           this.$message.success("提交成功")
-          this.$router.push({
-            path: "/containerNews/boxDistribution",
-          });
-
+          // this.$router.push({
+          //   path: "/containerNews/boxDistribution",
+          // });
+          let view = {
+            fullPath: "/containerNews/modifyPage?data=%7B%22typeidName%22%3A%221%22,%22fUpdateaddress%22%3A%22%E5%B1%B1%E4%B8%9C%22%7D",
+            hash: "",
+            matched: Array(2),
+            meta: Object,
+            name: "ModifyPage",
+            params: Object,
+            path: "/containerNews/modifyPage",
+            query: Object,
+            title: "修改页面"
+          }
+          this.$router.push({ path: '/containerNews/boxDistribution'})
+          this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {
+            if (this.isActive(view)) {
+              this.toLastView(visitedViews, view)
+            }
+          })
+          Global.$emit("removeCache", "closeSelectedTag", view);
         })
       },
       //地点带入
       bringIn(value,row){
+        console.log(value)
         for(let item in this.select){
-          this.select[item].foldSite = value
+          for(let li in this.addressOptions){
+            if(this.queryParams.fUpdateaddress == this.addressOptions[li].fId){
+              this.$set(this.select[item],'foldSite',this.addressOptions[li].fName)
+              this.$set(this.select[item],'fold',this.queryParams.fUpdateaddress)
+            }
+          }
+          // this.select[item].foldSite = value
         }
       },
       //空重带入选中列表

src/views/system/user/index.vue

@@ -227,10 +227,22 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择">
+          <el-form-item label="用户性别">
+            <el-select v-model="form.sex" placeholder="请选择">
+              <el-option
+                v-for="dict in sexOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户系统">
+              <el-select v-model="form.userSystem" placeholder="请选择">
                 <el-option
-                  v-for="dict in sexOptions"
+                  v-for="dict in SystemOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -350,6 +362,8 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      //用户系统
+      SystemOptions:[],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -465,6 +479,10 @@ export default {
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
+    this.getDicts("user_system").then(response => {
+      console.log(response)
+      this.SystemOptions = response.data;
+    });
   },
   methods: {
     /** 查询用户列表 */
@@ -529,7 +547,8 @@ export default {
         status: "0",
         remark: undefined,
         postIds: [],
-        roleIds: []
+        roleIds: [],
+        userSystem:undefined
       };
       this.resetForm("form");
     },
@@ -594,6 +613,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
+            console.log(this.form)
             updateUser(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;