仓库管理和入库修改

src/views/basicdata/dept/index.vue

@@ -101,8 +101,8 @@
               <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
             </el-form-item>
           </el-col>
-<!--        </el-row>-->
-<!--        <el-row>-->
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="编号" prop="fNo">
               <el-input v-model="form.fNo"  placeholder="请输入编号" />
@@ -144,6 +144,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="库容(吨)" prop="fTotalgross" >
+              <el-input v-model="form.fTotalgross" placeholder="请输入库容（吨位）"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -157,11 +162,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-          <el-form-item label="库容（吨）" prop="fTotalgross" >
-            <el-input v-model="form.fTotalgross" placeholder="请输入库容（吨位）"/>
-          </el-form-item>
-          </el-col>
         </el-row>
 
         <!--<el-form-item label="状态，默认 T ,正常T 停用F 下拉选择">

src/views/warehouseBusiness/inStock/index.vue

@@ -592,36 +592,58 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="品牌">
+            <el-form-item label="作业类型" prop="fBusinessType">
+              <el-select
+                style="width: 80%"
+                v-model="form.fBusinessType"
+                filterable
+                :disabled="contrOl"
+              >
+                <el-option
+                  v-for="(dict, index) in businessTypeOption"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="劳务公司" prop="labour">
               <el-input
-                v-model="form.fMarks"
                 style="width: 80%"
-                disabled
-                placeholder="品牌"
+                v-model="form.labour"
+
+                :disabled="browseStatus"
+                placeholder="请输入劳务公司"
               />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="车队" prop="fleet">
+              <el-input
+                style="width: 80%"
+                v-model="form.fleet"
+
+                :disabled="browseStatus"
+                placeholder="请输入车队"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="16">
             <el-form-item label="备注" prop="remark">
               <el-input
                 style="width: 100%"
                 v-model="form.remark"
-                type="textarea"
+
                 :disabled="browseStatus"
                 placeholder="请输入内容"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="品名" prop="fProductName">
-              <el-input
-                v-model="form.fProductName"
-                style="width: 80%"
-                disabled
-                placeholder="品名"
-              />
-            </el-form-item>
-          </el-col>
         </el-row>
 
         <div v-if="detailsHidden">
@@ -798,6 +820,28 @@
           </el-row>
           <el-row>
             <el-col :span="8">
+              <el-form-item label="品名" prop="fProductName">
+                <el-input
+                  v-model="form.fProductName"
+                  style="width: 80%"
+                  disabled
+                  placeholder="品名"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="品牌">
+                <el-input
+                  v-model="form.fMarks"
+                  style="width: 80%"
+                  disabled
+                  placeholder="品牌"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
               <el-form-item label="质押" prop="fIfpledge">
                 <el-select
                   v-model="form.fIfpledge"
@@ -908,18 +952,6 @@
             @click="submitForm(6)"
           >请核
           </el-button>
-          <el-select
-            v-model="form.fBusinessType"
-            filterable
-            :disabled="contrOl"
-          >
-            <el-option
-              v-for="(dict, index) in businessTypeOption"
-              :key="index.name"
-              :label="dict.name"
-              :value="dict.name"
-            ></el-option>
-          </el-select>
 
         </div>
         <div style="font-size: 18px">入库明细</div>
@@ -2878,11 +2910,7 @@ export default {
       // 制单部门
       deptOptions: [],
       // 主表状态
-      businessTypeOption: [{
-        name: '场地直装'
-      }, {
-        name: '常规入账'
-      }],
+      businessTypeOption: [],
       // 仓库(仓库数据)
       warehouseOptions: [],
       kqhouseOptions: [],
@@ -2958,7 +2986,7 @@ export default {
         fBankcorpid: null,
         fBilltype: null,
         fBillstatus: null,
-        fBusinessType: '常规入账',
+        fBusinessType: null,
         fCreateby: null,
         fCreatetime: null,
         fGoodsid: null,
@@ -2973,7 +3001,7 @@ export default {
       approVal:false,
       // 表单参数
       form: {
-        fBusinessType: '常规入账',
+        fBusinessType:null,
         fItemsStatus: null,
         fFeetunit: '2'
       },
@@ -3003,7 +3031,7 @@ export default {
           message: " ",
           trigger: "blur",
         },
-        fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
+        // fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
         fbillingway: [
           {
             required: true,
@@ -3056,6 +3084,9 @@ export default {
     this.getDicts("data_unitfees").then((response) => {
       this.jFeetunitOptions = response.data;
     });
+    this.getDicts("st_in_type").then((response) => {
+      this.businessTypeOption = response.data;
+    });
   },
   activated() {
     this.adoPt()
@@ -3541,7 +3572,7 @@ export default {
           this.userVal = response.user;
           this.$set(this.form, "fDeptid", this.userVal.deptId);
           this.$set(this.form, "createBy", this.userVal.userName);
-          this.$set(this.form,"fStorekeeper",this.userVal.userName)
+          this.$set(this.form,"fStorekeeper",this.userVal.nickName)
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
           this.$set(this.form, "fTrademodeid", "1");
@@ -3893,7 +3924,6 @@ export default {
     /** 新增按钮操作 */
     handleAdd(status) {
       this.form = {
-        fBusinessType: '常规入账',
           fItemsStatus: null,
           fFeetunit:"2"
       }
@@ -4383,6 +4413,15 @@ 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) {
@@ -4433,6 +4472,7 @@ export default {
           formDatae.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
           // 收款
           formDatae.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
+          console.log(this.form)
           addWarehousebills(formDatae).then((response) => {
             this.msgSuccess('保存成功')
             this.form = response.data.warehouseBills