入库仓库库位修改

src/views/basicdata/dept/index.vue

@@ -222,9 +222,9 @@ export default {
         fAddr: [
           { required: true, message: "地址不能为空", trigger: "blur" }
         ],
-        fTotalgross: [
-          { required: true, message: "库容不能为空", trigger: "blur" }
-        ],
+        // fTotalgross: [
+        //   { required: true, message: "库容不能为空", trigger: "blur" }
+        // ],
         parentId: [
           { required: true, message: "上级仓库不能为空", trigger: "blur" }
         ],

src/views/basicdata/warehouse/index.vue

@@ -6,7 +6,7 @@
       <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input
-            v-model="deptName"
+            v-model="fName"
             placeholder="请输入仓库名称"
             clearable
             size="small"
@@ -196,11 +196,10 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-form-item label="库容(吨)" prop="fTotalgross" >
+              <el-input v-model="form.fTotalgross" placeholder="请输入库容（吨位）"/>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.fStatus">
@@ -213,6 +212,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
 
 
@@ -238,6 +244,7 @@ export default {
   },
   data() {
     return {
+      fName:null,
       defaultProps: {
         children: "children",
         label: "label"
@@ -298,6 +305,12 @@ export default {
       }
     };
   },
+  watch: {
+    // 根据名称筛选部门树
+    fName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
     this.getList();
     this.getTreeselect();

src/views/warehouseBusiness/inStock/index.vue

@@ -548,13 +548,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车号">
+            <el-form-item
+              label="车号"
+              :rules="{
+              required: isrequired_s=== 1 ? true : false,
+               message: '请选择',
+               trigger: ['blur', 'change']
+                }">
               <el-input
-                :rules="{
-              required: isrequireds === 1 ? true : false,
-           message: '请选择',
-           trigger: ['blur', 'change']
-            }"
                 v-model="form.fTruckno"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -565,13 +566,14 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="司机姓名">
+            <el-form-item
+              label="司机姓名"
+              :rules="{
+                required: isrequired_s === 1 ? true : false,
+               message: '请选择',
+               trigger: ['blur', 'change']
+                }">
               <el-input
-                :rules="{
-              required: isrequireds === 1 ? true : false,
-           message: '请选择',
-           trigger: ['blur', 'change']
-            }"
                 v-model="form.fDriverName"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -580,13 +582,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="司机身份证">
+            <el-form-item label="司机身份证"
+                 :rules="{
+                 required: isrequired_s === 1 ? true : false,
+                 message: '请选择',
+                 trigger: ['blur', 'change']
+                  }">
               <el-input
-                :rules="{
-              required: isrequireds === 1 ? true : false,
-           message: '请选择',
-           trigger: ['blur', 'change']
-            }"
                 v-model="form.fDriverIdCar"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -595,13 +597,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="司机电话">
+            <el-form-item
+              label="司机电话"
+              :rules="{
+               required: isrequired_s === 1 ? true : false,
+               message: '请选择',
+               trigger: ['blur', 'change']
+                }">
               <el-input
-                :rules="{
-              required: isrequireds === 1 ? true : false,
-           message: '请选择',
-           trigger: ['blur', 'change']
-            }"
                 v-model="form.fDriverTel"
                 style="width: 80%"
                 :disabled="browseStatus || formBrowseStatus"
@@ -671,6 +674,18 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-button
+              style="margin-left: 120px"
+              size="small"
+              @click="
+              detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
+            "
+            >{{ detailsHidden ? '隐藏' : '展开' }}
+            </el-button
+            >
+
+          </el-col>
         </el-row>
 
         <div v-if="detailsHidden">
@@ -916,7 +931,7 @@
       <el-collapse v-model="activeNames">
         <el-collapse-item name="1" class="itemTitle minHeight">
           <template slot="title">
-            <i class="el-icon-shopping-cart-2"></i>入库明细
+            <i class="el-icon-s-home"></i>入库明细
           </template>
             <div
               class="dialogTableTitle flex a-center jlr"
@@ -944,14 +959,6 @@
                 >
               </div>
               <div>
-                <el-button
-                  size="small"
-                  @click="
-              detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
-            "
-                >{{ detailsHidden ? '隐藏' : '展开' }}
-                </el-button
-                >
                 <el-button  size="small" type="info" :disabled="browseStatus" prop="打印" @click="showEditDialog_sss"
                 >作业单
                 </el-button>
@@ -1451,7 +1458,7 @@
 
         <el-collapse-item>
           <template slot="title">
-            <i class="el-icon-folder"></i>附件明细
+            <i class="el-icon-s-order"></i>附件明细
           </template>
           <div
             class="dialogTableTitle flex a-center jlr"
@@ -1570,7 +1577,7 @@
 
         <el-collapse-item>
           <template slot="title">
-            <i class="el-iconshoukuan1"></i>收款信息
+            <i class="el-icon-circle-plus"></i>收款信息
           </template>
           <div
             class="dialogTableTitle flex a-center jlr"
@@ -1876,7 +1883,7 @@
 
         <el-collapse-item>
           <template slot="title">
-            <i class="header-icon el-icon-info"></i>付款信息
+            <i class="el-icon-remove"></i>付款信息
           </template>
           <div
             class="dialogTableTitle flex a-center jlr"
@@ -2836,7 +2843,7 @@ export default {
     return {
       activeNames:['1'],
       isrequired:2,
-      isrequireds:2,
+      isrequired_s:2,
       approval:[],
       doNot:false,
       // 修改查看状态
@@ -4490,14 +4497,14 @@ export default {
     },
     //作业类型校验
     Educationchange() {
-
       console.log(this.form.fBusinessType)
-      if (this.form.fBusinessType == '1' || this.form.fBusinessType == '2') {
+      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 if(this.form.fBusinessType === 3 || this.form.fBusinessType === 4){
+        console.log("333")
+        this.isrequired_s = 1
       }else{
         this.isrequired = 2
       }
@@ -4817,6 +4824,11 @@ export default {
 }
 
  .el-collapse-item__header{
-   font-size: 20px
+   font-size: 16px;
+   font-weight: bolder;
+   padding-left: 5px;
+ }
+ .el-icon-s-home,.el-icon-s-order,.el-icon-circle-plus,.el-icon-remove{
+   padding-right: 5px;
  }
 </style>