入库仓库修改

src/api/basicdata/dept.js

@@ -12,7 +12,7 @@ export function listDept(query) {
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(deptId) {
   return request({
-    url: '/system/dept/list/exclude/' + deptId,
+    url: '/basicdata/warehouse/list/exclude/' + deptId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function listDeptExcludeChild(deptId) {
 // 查询部门详细
 export function getDept(deptId) {
   return request({
-    url: '/system/dept/' + deptId,
+    url: '/basicdata/warehouse/' + deptId,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getDept(deptId) {
 // 查询部门下拉树结构
 export function treeselect() {
   return request({
-    url: '/system/dept/treeselect',
+    url: '/basicdata/warehouse/treeselect',
     method: 'get'
   })
 }
@@ -36,7 +36,7 @@ export function treeselect() {
 // 根据角色ID查询部门树结构
 export function roleDeptTreeselect(roleId) {
   return request({
-    url: '/system/dept/roleDeptTreeselect/' + roleId,
+    url: '/basicdata/warehouse/roleDeptTreeselect/' + roleId,
     method: 'get'
   })
 }
@@ -53,7 +53,7 @@ export function addDept(data) {
 // 修改部门
 export function updateDept(data) {
   return request({
-    url: '/system/dept',
+    url: '/basicdata/warehouse',
     method: 'put',
     data: data
   })
@@ -62,7 +62,7 @@ export function updateDept(data) {
 // 删除部门
 export function delDept(deptId) {
   return request({
-    url: '/system/dept/' + deptId,
+    url: '/basicdata/warehouse/' + deptId,
     method: 'delete'
   })
 }

src/views/basicdata/dept/index.vue

@@ -1,17 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="fName">
+      <el-form-item label="仓库名称" prop="fName">
         <el-input
           v-model="queryParams.fName"
-          placeholder="请输入部门名称"
+          placeholder="请输入仓库名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
+        <el-select v-model="queryParams.status" placeholder="仓库状态" clearable size="small">
           <el-option
             v-for="dict in statusOptions"
             :key="dict.dictValue"
@@ -46,7 +46,7 @@
       default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="fName" label="部门名称" width="260"></el-table-column>
+      <el-table-column prop="fName" label="仓库名称" width="260"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="100"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">
@@ -82,18 +82,18 @@
       </el-table-column>
     </el-table>
 
-    <!-- 添加或修改部门对话框 -->
+    <!-- 添加或修改仓库对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="70%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="8" v-if="form.parentId !== 0">
-            <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+            <el-form-item label="上级仓库" prop="parentId">
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级仓库" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="部门名称" prop="fName">
-              <el-input v-model="form.fName" placeholder="请输入部门名称" />
+            <el-form-item label="仓库名称" prop="fName">
+              <el-input v-model="form.fName" placeholder="请输入仓库名称" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -108,11 +108,11 @@
               <el-input v-model="form.fNo"  placeholder="请输入编号" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="名称" prop="fName">
-              <el-input v-model="form.fName" placeholder="请输入名称" />
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="名称" prop="fName">-->
+<!--              <el-input v-model="form.fName" placeholder="请输入名称" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="8">
             <el-form-item label="地址" prop="fAddr">
               <el-input v-model="form.fAddr" placeholder="请输入地址" />
@@ -200,7 +200,7 @@ export default {
       showSearch: true,
       // 表格树数据
       deptList: [],
-      // 部门树选项
+      // 仓库树选项
       deptOptions: [],
       // 弹出层标题
       title: "",
@@ -217,22 +217,24 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        fNo: [
+          { required: true, message: "编号不能为空", trigger: "blur" }
+        ],
+        fAddr: [
+          { required: true, message: "地址不能为空", trigger: "blur" }
+        ],
+        fTotalgross: [
+          { required: true, message: "库容不能为空", trigger: "blur" }
+        ],
         parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
+          { required: true, message: "上级仓库不能为空", trigger: "blur" }
         ],
         fName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          { required: true, message: "仓库名称不能为空", trigger: "blur" }
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
-        email: [
-          {
-            type: "email",
-            message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
         phone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -250,7 +252,7 @@ export default {
     });
   },
   methods: {
-    /** 查询部门列表 */
+    /** 查询仓库列表 */
     getList() {
       this.loading = true;
       listDept(this.queryParams).then(response => {
@@ -258,7 +260,7 @@ export default {
         this.loading = false;
       });
     },
-    /** 转换部门数据结构 */
+    /** 转换仓库数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
         delete node.children;
@@ -308,7 +310,7 @@ export default {
         this.form.parentId = row.fId;
       }
       this.open = true;
-      this.title = "添加部门";
+      this.title = "添加仓库";
       listDept().then(response => {
 	        this.deptOptions = this.handleTree(response.data, "fId");
       });
@@ -319,7 +321,7 @@ export default {
       getDept(row.fId).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改部门";
+        this.title = "修改仓库";
       });
       listDeptExcludeChild(row.fId).then(response => {
 	        this.deptOptions = this.handleTree(response.data, "fId");

src/views/warehouseBusiness/inStock/index.vue

@@ -550,6 +550,11 @@
           <el-col :span="8">
             <el-form-item label="车号">
               <el-input
+                :rules="{
+              required: isrequireds === 1 ? true : false,
+           message: '请选择',
+           trigger: ['blur', 'change']
+            }"
                 v-model="form.fTruckno"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -562,6 +567,11 @@
           <el-col :span="8">
             <el-form-item label="司机姓名">
               <el-input
+                :rules="{
+              required: isrequireds === 1 ? true : false,
+           message: '请选择',
+           trigger: ['blur', 'change']
+            }"
                 v-model="form.fDriverName"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -572,6 +582,11 @@
           <el-col :span="8">
             <el-form-item label="司机身份证">
               <el-input
+                :rules="{
+              required: isrequireds === 1 ? true : false,
+           message: '请选择',
+           trigger: ['blur', 'change']
+            }"
                 v-model="form.fDriverIdCar"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -582,6 +597,11 @@
           <el-col :span="8">
             <el-form-item label="司机电话">
               <el-input
+                :rules="{
+              required: isrequireds === 1 ? true : false,
+           message: '请选择',
+           trigger: ['blur', 'change']
+            }"
                 v-model="form.fDriverTel"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -597,6 +617,7 @@
                 style="width: 80%"
                 v-model="form.fBusinessType"
                 filterable
+                @change="Educationchange"
                 :disabled="contrOl"
               >
                 <el-option
@@ -621,7 +642,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车队" prop="fleet">
+            <el-form-item label="车队" prop="fleet"
+                :rules="{
+              required: isrequired === 1 ? true : false,
+           message: '请选择',
+           trigger: ['blur', 'change']
+            }"
+            >
               <el-input
                 style="width: 80%"
                 v-model="form.fleet"
@@ -2779,6 +2806,8 @@ export default {
   },
   data() {
     return {
+      isrequired:2,
+      isrequireds:2,
       approval:[],
       doNot:false,
       // 修改查看状态
@@ -3031,6 +3060,7 @@ export default {
           message: " ",
           trigger: "blur",
         },
+        // fleet:[{required: this.isrequired == '1' ? true : false,message: " ", trigger: "blur"}],
         // fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
         fbillingway: [
           {
@@ -4413,15 +4443,6 @@ export default {
         this.pleaseCheck();
       }
     },
-    //作业类型校验
-    // regular(){
-    //   this.fBusinessType =[
-    //     fields: {
-    //     country: {required: true, message: '请选择国家', trigger: 'blur'},
-    //     city: {required: true, message: '请选择城市', trigger: 'blur'}
-    //   }
-    //   ]
-    // },
     // 更新主表唛头、品名并去重
     updateDeduplication: function() {
       if (this.dataList.length === 0) {
@@ -4438,6 +4459,20 @@ export default {
       this.$set(this.form, 'fMarks', Array.from(new Set(fMarks)).join(","))
       this.$set(this.form, 'fProductName', Array.from(new Set(fGoodsid)).join(","))
     },
+    //作业类型校验
+    Educationchange() {
+
+      console.log(this.form.fBusinessType)
+      if (this.form.fBusinessType == '1' || this.form.fBusinessType == '2') {
+        console.log("111")
+        console.log("走这")
+        this.isrequired = 1
+      }else if(this.form.fBusinessType == '3' || this.form.fBusinessType == '4'){
+        this.isrequireds = 1
+      }else{
+        this.isrequired = 2
+      }
+    },
     // 提交保存保存成功
     preservation() {
       this.$refs['form'].validate((valid) => {
@@ -4460,6 +4495,7 @@ export default {
               return false
             }
           }
+
           let formDatae = new window.FormData()
           // 附件数据
           this.form.fBillingway = this.form.fFeetunit