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

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

@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="编号" prop="fNo">
-            <el-input style="width: 250px" v-model="queryParams.fNo" placeholder="请选择客户类别" clearable size="small">
+            <el-input style="width: 250px" v-model="queryParams.fNo" placeholder="请输入编号" clearable size="small">
             </el-input>
           </el-form-item>
 
@@ -27,7 +27,7 @@
             <el-select
               v-model="queryParams.fStatus"
               style="width: 250px"
-              placeholder="请输入或选择"
+              placeholder="请选择状态"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -45,7 +45,7 @@
               <el-select
                 v-model="queryParams.fType"
                 style="width: 250px"
-                placeholder=""
+                placeholder="请选择箱种类"
                 clearable
                 size="small"
                 filterable
@@ -82,6 +82,7 @@
                 style="width: 250px"
                 clearable
                 size="small"
+                placeholder="请输入UNCODE"
               />
             </el-form-item>
 
@@ -93,7 +94,7 @@
               <el-input
                 v-model="queryParams.createBy"
                 style="width: 250px"
-                placeholder="请输入电话"
+                placeholder="请输入录入人"
                 clearable
                 size="small"
                 @keyup.enter.native="handleQuery"
@@ -277,7 +278,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="箱种类" prop="fType" label-width="90px">
-              <el-select style="width: 80%" :disabled="doNot" v-model="form.fType" placeholder="请选择客户类别">
+              <el-select style="width: 80%" :disabled="doNot" v-model="form.fType" placeholder="请选择箱种类">
                 <el-option
                   v-for="dict in containerOptions"
                   :key="dict.dictValue"
@@ -289,7 +290,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="UNCODE" prop="fUncode" label-width="90px">
-              <el-input v-model="form.fUncode" :disabled="doNot" style="width: 80%" placeholder="请输入编号" />
+              <el-input v-model="form.fUncode" :disabled="doNot" style="width: 80%" placeholder="请输入UNCODE" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,7 +302,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="TEU" prop="fTeu" label-width="90px">
-              <el-input v-model="form.fTeu" :disabled="doNot" style="width: 80%" placeholder="请输入编号" />
+              <el-input v-model="form.fTeu" :disabled="doNot" style="width: 80%" placeholder="请输入TEU" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -313,19 +314,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="英文名" prop="fEname" label-width="90px">
-              <el-input v-model="form.fEname" :disabled="doNot" style="width: 80%" placeholder="请输入简称" />
+              <el-input v-model="form.fEname" :disabled="doNot" style="width: 80%" placeholder="请输入英文名" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="毛重" prop="fWeight" label-width="90px">
-              <el-input v-model="form.fWeight" :disabled="doNot" style="width: 80%" placeholder="请输入英文名称" />
+            <el-form-item label="毛重（T）" prop="fWeight" label-width="90px">
+              <el-input v-model="form.fWeight" :disabled="doNot" style="width: 80%" placeholder="请输入毛重" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="容积" prop="fCbm" label-width="90px">
-              <el-input v-model="form.fCbm" :disabled="doNot" style="width: 80%" placeholder="请输入编号" />
+            <el-form-item label="容积（立方）" prop="fCbm" label-width="90px">
+              <el-input v-model="form.fCbm" :disabled="doNot" style="width: 80%" placeholder="请输入容积" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -359,7 +360,7 @@
           </el-col>
           <el-col :span="12" label-width="90px">
             <el-form-item label="状态" prop="fStatus" label-width="90px">
-              <el-select v-model="form.fStatus" style="width: 80%" :disabled="doNot" placeholder="请输入内容" >
+              <el-select v-model="form.fStatus" style="width: 80%" :disabled="doNot" placeholder="请选择状态" >
                 <el-option label="正常" value="T"/>
                 <el-option label="停用" value="F"/>
               </el-select>
@@ -369,7 +370,7 @@
         <el-row>
           <el-col :span="24" label-width="90px">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" style="width: 100%" :disabled="doNot" placeholder="请输入电话" />
+              <el-input v-model="form.remark" style="width: 100%" :disabled="doNot" placeholder="" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -516,7 +517,15 @@
         },
         // 表单校验
         rules: {
-
+          fNo: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+          ],
+          fName: [
+            { required: true, message: "名称不能为空", trigger: "blur" }
+          ],
+          fEname: [
+            { required: true, message: "英文名不能为空", trigger: "blur" }
+          ],
         }
       };
     },

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

@@ -6,7 +6,7 @@
             <el-select
               style="width: 240px"
               v-model="queryParams.fName"
-              placeholder=""
+              placeholder="请选择港口名称"
               clearable size="small"
               filterable
               :remote-method="portRemoteMethod">
@@ -22,7 +22,7 @@
             <el-select
               v-model="queryParams.portName"
               style="width: 240px"
-              placeholder="请输入名称"
+              placeholder="请选择航线"
               clearable
               filterable
               size="small"
@@ -41,7 +41,7 @@
             <el-input
               v-model="queryParams.fUncode"
               style="width: 240px"
-              placeholder="请输入"
+              placeholder="请输入UNCODE"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -55,7 +55,7 @@
             <el-input
               v-model="queryParams.fCountry"
               style="width: 240px"
-              placeholder="请输入电话"
+              placeholder="请输入国家"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -65,7 +65,7 @@
           <el-form-item label="省" prop="fProvince">
             <el-input
               v-model="queryParams.fProvince"
-              placeholder="客户状态"
+              placeholder="请输入省"
               clearable
               size="small"
               style="width: 240px"
@@ -75,7 +75,7 @@
           <el-form-item label="市" prop="fCity">
             <el-input
               v-model="queryParams.fCity"
-              placeholder="客户状态"
+              placeholder="请输入市"
               clearable
               size="small"
               style="width: 240px"
@@ -85,7 +85,7 @@
           <el-form-item label="状态" prop="fStatus">
             <el-select
               v-model="queryParams.fStatus"
-              placeholder="客户状态"
+              placeholder="请选择状态"
               clearable
               size="small"
               style="width: 240px"
@@ -99,7 +99,7 @@
           <el-form-item label="录入人" prop="createBy">
             <el-input
               v-model="queryParams.createBy"
-              placeholder=""
+              placeholder="请输入录入人"
               clearable
               size="small"
               style="width: 240px"
@@ -280,7 +280,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="港口类型" prop="fPort" label-width="90px">
-              <el-select style="width: 80%" v-model="form.fPort"  placeholder="请选择港口类型" disabled>
+              <el-select style="width: 80%" v-model="form.fPort"  placeholder="请选择港口类型" :disabled="doNot">
                 <el-option
                   v-for="dict in portOptions"
                   :key="dict.dictValue"
@@ -293,19 +293,19 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="UNCODE" prop="fUncode" label-width="90px">
-              <el-input v-model="form.fUncode" style="width: 80%" placeholder="请输入编号" :disabled="doNot"/>
+              <el-input v-model="form.fUncode" style="width: 80%" placeholder="请输入UNCODE" :disabled="doNot"/>
             </el-form-item>
           </el-col>
         </el-row>
         <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="请输入名称" :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="fTypes" label-width="90px">
-              <el-select style="width: 80%" v-model="form.fTypes" :disabled="doNot" placeholder="请输入编号">
+              <el-select style="width: 80%" v-model="form.fTypes" disabled placeholder="请输入编号">
                 <el-option
                   v-for="(dict, index) in fTypesOptions"
                   :key="index.dictValue"
@@ -531,7 +531,12 @@
         },
         // 表单校验
         rules: {
-
+          fNo: [
+            { required: true, message: "编号不能为空", trigger: "blur" }
+          ],
+          fName: [
+            { required: true, message: "名称不能为空", trigger: "blur" }
+          ],
         }
       };
     },

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

@@ -7,7 +7,7 @@
             <el-select
               style="width: 250px"
               v-model="queryParams.fPort"
-              placeholder="请选择客户类别"
+              placeholder="请选择港口名称"
               clearable
               size="small"
               filterable
@@ -28,7 +28,7 @@
             <el-select
               v-model="queryParams.fName"
               style="width: 250px"
-              placeholder="请输入名称"
+              placeholder="请选择码头"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -48,7 +48,7 @@
             <el-select
               v-model="queryParams.fStatus"
               style="width: 250px"
-              placeholder="请输入或选择"
+              placeholder="请选择状态"
               clearable
               size="small"
               @keyup.enter.native="handleQuery"
@@ -67,7 +67,7 @@
               <el-input
                 v-model="queryParams.createBy"
                 style="width: 250px"
-                placeholder="请输入电话"
+                placeholder="请输入录入人"
                 clearable
                 size="small"
                 @keyup.enter.native="handleQuery"
@@ -251,7 +251,7 @@
               <el-select
                 style="width: 90%"
                 v-model="form.fPort"
-                placeholder="请选择客户类别"
+                placeholder="请选择港口简称"
                 :disabled="doNot"
                 filterable
                 :remote-method="portRemoteMethod"
@@ -274,7 +274,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="码头全称" prop="fName">
-              <el-input v-model="form.fName" style="width: 78%" placeholder="请输入名称" :disabled="doNot"/>
+              <el-input v-model="form.fName" style="width: 78%" placeholder="请输入码头名称" :disabled="doNot"/>
             </el-form-item>
           </el-col>
 
@@ -294,7 +294,7 @@
 
           <el-col :span="12">
             <el-form-item label="英文名" prop="fEname">
-              <el-input v-model="form.fEname" style="width: 78%" placeholder="请输入简称" :disabled="doNot"/>
+              <el-input v-model="form.fEname" style="width: 78%" placeholder="请输入英文名" :disabled="doNot"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -303,7 +303,7 @@
 
           <el-col :span="12">
             <el-form-item label="状态" prop="fStatus">
-              <el-select v-model="form.fStatus" style="width: 80%" placeholder="请输入英文名称" :disabled="doNot">
+              <el-select v-model="form.fStatus" style="width: 80%" placeholder="请选择状态" :disabled="doNot">
                 <el-option label="正常" value="T"/>
                 <el-option label="停用" value="F"/>
               </el-select>
@@ -459,7 +459,9 @@
         },
         // 表单校验
         rules: {
-
+          fNo: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+          fName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+          fPort:[{ required: true, message: '名称不能为空', trigger: 'blur' }]
         }
       };
     },