Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/api/warehouseBusiness/warehouseInStock.js

@@ -123,6 +123,13 @@ export function delinStock(fId) {
     method: 'delete'
   })
 }
+//删除前的判断2
+export function delinStock_s(fId) {
+  return request({
+    url: '/warehouseBusiness/inStock/queryRemove/' + fId,
+    method: 'delete'
+  })
+}
 
 
 //详情列表
@@ -132,4 +139,4 @@ export function detailStock(query) {
     method: 'get',
     params: query
   })
-}
+}

src/views/basicdata/fleet/carManage-add-or-update.vue

@@ -721,7 +721,7 @@ export default {
   },
   methods: {
     changeCar(id) {
-      driverMsglist({ fPid: id, fStatus: 1 }).then((data) => {
+      driverMsglist({ fPid: id, fStatus: 0 }).then((data) => {
         this.driverMans = data;
       });
       this.dataFormD.driverId=null

src/views/basicdata/fleet/companyMsg.vue

@@ -185,9 +185,9 @@
     <el-pagination
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
-      :current-page="dataForm.current"
+      :current-page="dataForm.pageNum"
       :page-sizes="[10, 20, 50, 100]"
-      :page-size="dataForm.size"
+      :page-size="dataForm.pageSize"
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper"
     >
@@ -211,11 +211,11 @@ export default {
   data() {
     return {
       dataForm: {
+        pageNum: 1,
+        pageSize: 10,
         fName: '',
         fManage: '',
         fTel: '',
-        current: 1,
-        size: 10
       },
       editModel: {},
       dataList: [],
@@ -270,7 +270,7 @@ export default {
     },
     // 当前页
     currentChangeHandle(val) {
-      this.dataForm.current = val
+      this.dataForm.pageNum = val
       this.getDataList()
     },
     // 多选

src/views/basicdata/fleet/driverMsg.vue

@@ -4,7 +4,7 @@
 
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input v-model="dataForm.name" placeholder="驾驶员姓名" clearable></el-input>
+        <el-input v-model="dataForm.fName" placeholder="驾驶员姓名" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-input v-model="dataForm.fTel" placeholder="联系电话" clearable></el-input>
@@ -176,7 +176,7 @@ import {listFtmsorderbills, deleted} from '@/api/fleet/driverMsg'
     data () {
       return {
         dataForm: {
-          name: null,
+          fName: null,
           fTel: null,
           pageNum: 1,
           pageSize: 10
@@ -220,8 +220,8 @@ import {listFtmsorderbills, deleted} from '@/api/fleet/driverMsg'
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
+        console.log(this.dataForm)
         listFtmsorderbills(this.dataForm).then(data=>{
-          console.log(data)
           if (data && data.code === 200) {
             this.dataList = data.rows
             this.totalPage = data.total
@@ -234,14 +234,13 @@ import {listFtmsorderbills, deleted} from '@/api/fleet/driverMsg'
       },
       // 每页数
       sizeChangeHandle (val) {
-        console.log(val)
         this.dataForm.pageSize = val
         this.pageIndex = 1
         this.getDataList()
       },
       // 当前页
       currentChangeHandle (val) {
-        this.dataForm.current = val
+        this.dataForm.pageNum = val
         this.getDataList()
       },
       // 多选
@@ -291,7 +290,7 @@ import {listFtmsorderbills, deleted} from '@/api/fleet/driverMsg'
               this.$message({
                 message: '操作成功',
                 type: 'success',
-                duration: 1500,
+                duration: 600,
                 onClose: () => {
                   this.getDataList()
                 }

src/views/fleet/plans/AddOrUpdate.vue

@@ -676,9 +676,9 @@
                     >
                       <el-option
                         v-for="(dict, index) in companyList"
-                        :key="index.id"
-                        :label="dict.companyName"
-                        :value="dict.id"
+                        :key="index.fId"
+                        :label="dict.fName"
+                        :value="dict.fId"
                       />
                     </el-select>
                   </template>
@@ -1496,7 +1496,7 @@ export default {
       this.fWbuOptions = response.rows;
     });
     company({
-      fStatus: 1,
+      fStatus: 0,
     }).then((response) => {
       this.companyList = response.rows;
     });

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -1478,7 +1478,7 @@ export default {
       this.fWbuOptions = response.rows;
     });
     company({
-      fStatus:1
+      fStatus:0
     }).then((response) => {
       this.companyList = response.rows;
     });

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1484,7 +1484,7 @@ export default {
       this.carManages = response;
     });
     company({
-      fStatus: 1,
+      fStatus: 0,
     }).then((response) => {
       this.companyList = response.rows;
     });

src/views/kaihe/shipDynamics/vesselDetail/index.vue

@@ -317,6 +317,7 @@
       >
         <template slot-scope="scope">
           <span v-if="item.label == 'fNo'">{{scope.row.fNo}}</span>
+          <span v-if="item.label == 'pidName'">{{scope.row.pidName}}</span>
           <span v-if="item.label == 'portofloadidName'">{{scope.row.portofloadidName}}</span>
           <span v-if="item.label == 'portofdischargeidName'">{{scope.row.portofdischargeidName}}</span>
           <span v-if="item.label == 'distinationidName'">{{scope.row.distinationidName}}</span>
@@ -758,6 +759,14 @@
           },
           {
             surface: "2",
+            label: "pidName",
+            name: "船名",
+            fixed:"left",
+            checked: 0,
+            width: 120,
+          },
+          {
+            surface: "3",
             label: "portofloadidName",
             name: "装货港",
             fixed:"left",
@@ -765,7 +774,7 @@
             width: 120,
           },
           {
-            surface: "3",
+            surface: "4",
             label: "portofdischargeidName",
             name: "卸货港",
             fixed:"left",
@@ -773,7 +782,7 @@
             width: 120,
           },
           {
-            surface: "4",
+            surface: "5",
             label: "distinationidName",
             name: "目的地",
             fixed:"left",
@@ -781,7 +790,7 @@
             width: 120,
           },
           {
-            surface: "5",
+            surface: "6",
             label: "portoftransshipmentName",
             name: "中转港",
             fixed:"left",
@@ -789,7 +798,7 @@
             width: 120,
           },
           {
-            surface: "6",
+            surface: "7",
             label: "fEtd",
             name: "预计开船日期",
             fixed:"left",
@@ -797,84 +806,84 @@
             width: 120,
           },
           {
-            surface: "7",
+            surface: "8",
             label: "fAtd",
             name: "开船日期",
             checked: 0,
             width: 120,
           },
           {
-            surface: "8",
+            surface: "9",
             label: "fEta",
             name: "预计到达日期",
             checked: 0,
             width: 120,
           },
           {
-            surface: "9",
+            surface: "10",
             label: "fAta",
             name: "到港日",
             checked: 0,
             width: 120,
           },
           {
-            surface: "10",
+            surface: "11",
             label: "manageidName",
             name: "船管人",
             checked: 0,
             width: 120,
           },
           {
-            surface: "11",
+            surface: "12",
             label: "fTel",
             name: "联系方式",
             checked: 0,
             width: 120,
           },
           {
-            surface: "12",
+            surface: "13",
             label: "fDays",
             name: "航期",
             checked: 0,
             width: 120,
           },
           {
-            surface: "13",
+            surface: "14",
             label: "fStatus",
             name: "状态",
             checked: 0,
             width: 120,
           },
           {
-            surface: "14",
+            surface: "15",
             label: "remark",
             name: "备注",
             checked: 0,
             width: 120,
           },
           {
-            surface: "15",
+            surface: "16",
             label: "createBy",
             name: "录入人",
             checked: 0,
             width: 120,
           },
           {
-            surface: "16",
+            surface: "17",
             label: "createTime",
             name: "录入时间",
             checked: 0,
             width: 120,
           },
           {
-            surface: "17",
+            surface: "18",
             label: "updateBy",
             name: "最新修改人",
             checked: 0,
             width: 120,
           },
           {
-            surface: "18",
+            surface: "19",
             label: "updateTime",
             name: "最新修改时间",
             checked: 0,

src/views/kaihe/shipDynamics/vesselList/index.vue

@@ -101,7 +101,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['shipping:items:add']"
+          v-hasPermi="['shipping:vessel:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -111,7 +111,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['shipping:items:edit']"
+          v-hasPermi="['shipping:vessel:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -121,7 +121,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['shipping:items:remove']"
+          v-hasPermi="['shipping:vessel:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -130,7 +130,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['shipping:items:import']"
+          v-hasPermi="['shipping:vessel:import']"
         >导入</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -139,7 +139,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['shipping:items:export']"
+          v-hasPermi="['shipping:vessel:export']"
         >导出</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -148,7 +148,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['basicdata:yard:list']"
+          v-hasPermi="['basicdata:vessel:list']"
         >取消</el-button>
       </el-col>
       <el-col  style="position: absolute;left:70%" :span="5" >
@@ -286,14 +286,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-hasPermi="['shipping:items:edit']"
+            v-hasPermi="['shipping:vessel:edit']"
             @click="handleUpdate(scope.row)"
           >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-hasPermi="['shipping:items:remove']"
+            v-hasPermi="['shipping:vessel:remove']"
             @click="handleDelete(scope.row)"
           >移除</el-button>
         </template>

src/views/track/cabinet/AddOrUpdate.vue

@@ -104,7 +104,6 @@
                 style="width: 180px"
                 v-model="form.tLoadDate"
                 type="date"
-                value-format="yyyy-MM-dd"
                 placeholder="选择计划装车时间"
                 :disabled="true"
               >
@@ -114,7 +113,7 @@
           <el-col :span="6">
             <el-form-item label="联系人" prop="loadAttn">
               <el-input
-                v-model="form.loadAttn"
+                v-model="form.tLoadAttn"
                 placeholder="请输入装车联系人"
                 :disabled="true"
                 size="mini"
@@ -125,7 +124,7 @@
           <el-col :span="6">
             <el-form-item label="联系电话" prop="loadAttntel">
               <el-input
-                v-model="form.loadAttntel"
+                v-model="form.tLoadAttntel"
                 placeholder="请输入装车联系电话"
                 :disabled="true"
                 v-input-limit="0"
@@ -139,7 +138,7 @@
           <el-col :span="6">
             <el-form-item label="卸车地点" prop="unLoadAddr">
               <el-input
-                v-model="form.unLoadAddr"
+                v-model="form.tUnLoadAddr"
                 placeholder="请输入卸车地点"
                 :disabled="true"
                 size="mini"
@@ -155,7 +154,6 @@
                 style="width: 180px"
                 v-model="form.tUnLoadDate"
                 type="date"
-                value-format="yyyy-MM-dd"
                 placeholder="选择计划卸车时间"
                 :disabled="true"
               >
@@ -165,7 +163,7 @@
           <el-col :span="6">
             <el-form-item label="联系人" prop="unLoadAttn">
               <el-input
-                v-model="form.unLoadAttn"
+                v-model="form.tUnLoadAttn"
                 placeholder="请输入卸车联系人"
                 :disabled="true"
                 size="mini"
@@ -176,7 +174,7 @@
           <el-col :span="6">
             <el-form-item label="联系电话" prop="unLoadAttnTel">
               <el-input
-                v-model="form.unLoadAttnTel"
+                v-model="form.tUnLoadAttnTel"
                 placeholder="请输入卸车联系电话"
                 :disabled="true"
                 v-input-limit="0"

src/views/warehouseCheck/index.vue → src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -50,7 +50,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['warehouse:log:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -60,7 +59,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['warehouse:log:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -70,7 +68,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['warehouse:log:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -79,7 +76,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['warehouse:log:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -98,7 +94,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleAdd(scope.row)"
           >修改</el-button>
           <el-button
             size="mini"