新增字段

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -235,7 +235,7 @@
               v-model="form.fCustomno"
               style="width: 80%"
               :disabled="browseStatus"
-              laceholder="报关单号"
+              placeholder="报关单号"
             />
           </el-form-item>
         </el-col>
@@ -247,7 +247,8 @@
               v-model.number="form.fPlanqty"
               style="width: 80%"
               maxlength="9"
-              laceholder="计划件数"
+              v-input-limit="0"
+              placeholder="计划件数"
               :disabled="browseStatus || current !== before"
             />
           </el-form-item>
@@ -259,7 +260,7 @@
               style="width: 80%"
               maxlength="9"
               v-input-limit="2"
-              laceholder="计划净重"
+              placeholder="计划净重"
               :disabled="browseStatus || current !== before"
               @change="tfNetweight"
             >
@@ -273,7 +274,7 @@
               v-model="form.fPlangrossweight"
               v-input-limit="2"
               style="width: 80%"
-              laceholder="计划毛重"
+              placeholder="计划毛重"
               maxlength="9"
               :disabled="browseStatus || current !== before"
               @change="tfGrossweight"
@@ -625,6 +626,7 @@
                 clearable
                 filterable
                 placeholder="请输入关键词"
+                style="width: 80%"
               >
                 <el-option
                   v-for="(item, index) in fSbuOptions"
@@ -755,7 +757,7 @@
                 disabled
                 v-model="form.fBscorpno"
                 style="width: 80%"
-                laceholder="存货编号"
+                placeholder="存货编号"
               />
             </el-form-item>
           </el-col>
@@ -797,6 +799,184 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="业务归属" prop="fBusinessAttribution">
+              <el-select
+                v-model="form.fBusinessAttribution"
+                placeholder="请选择业务归属"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(item, index) in battributionList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="监管单位" prop="fSupervisionUnit">
+              <el-select
+                v-model="form.fSupervisionUnit"
+                clearable
+                filterable
+                placeholder="请输入关键词"
+                style="width: 80%"
+                :disabled="browseStatus"
+              >
+                <el-option
+                  v-for="(item, index) in fMblnoOptions"
+                  :key="index.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="申报要素" prop="fDeclarationElements">
+              <el-select
+                v-model="form.fDeclarationElements"
+                placeholder="请选择申报要素"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(item, index) in delementsList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="料件号" prop="fPartNumber">
+              <el-input
+                v-model.number="form.fPartNumber"
+                style="width: 80%"
+                placeholder="料件号"
+                v-input-limit="0"
+                :disabled="browseStatus"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否法检" prop="fIfinspection">
+              <el-select
+                v-model="form.fIfinspection"
+                placeholder="是否法检"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(item, index) in ifinspectionList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="货值" prop="fValue">
+              <el-input
+                v-model.number="form.fValue"
+                style="width: 80%"
+                placeholder="货值"
+                v-input-limit="2"
+                :disabled="browseStatus"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="过磅时间" prop="fWeighingDate">
+              <el-date-picker
+                v-model="form.fWeighingDate"
+                style="width: 80%"
+                type="date"
+                :disabled="browseStatus"
+                value-format="timestamp"
+                placeholder="请选择过磅时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否取样" prop="fIfsampling">
+              <el-select
+                v-model="form.fIfsampling"
+                placeholder="是否取样"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(item, index) in ifsamplingList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="送样时间" prop="sendSampleDate">
+              <el-date-picker
+                v-model="form.sendSampleDate"
+                style="width: 80%"
+                type="date"
+                :disabled="browseStatus"
+                value-format="timestamp"
+                placeholder="请选择送样时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="是否复磅" prop="fIfweightRecovery">
+              <el-select
+                v-model="form.fIfweightRecovery"
+                placeholder="是否复磅"
+                clearable
+                :disabled="browseStatus"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(item, index) in ifweightRecoveryList"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="复磅时间" prop="weightRecoveryDate">
+              <el-date-picker
+                v-model="form.weightRecoveryDate"
+                style="width: 80%"
+                type="date"
+                :disabled="browseStatus"
+                value-format="timestamp"
+                placeholder="请选择复磅时间"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </div>
     </el-form>
     <el-dialog
@@ -2790,6 +2970,12 @@ export default {
       tfGrossweightnum: 0,
       tfNetweightnum2: 0,
       tfGrossweightnum2: 0,
+      deptOptions: [],
+      battributionList: [],
+      delementsList: [],
+      ifinspectionList: [],
+      ifsamplingList: [],
+      ifweightRecoveryList: [],
     };
   },
   created() {
@@ -2821,6 +3007,22 @@ export default {
     this.getDicts("unload_mode").then((response) => {
       this.unloadModes = response.data;
     });
+
+    this.getDicts("f_business_attribution").then((response) => {
+      this.battributionList = response.data;
+    });
+    this.getDicts("f_declaration_elements").then((response) => {
+      this.delementsList = response.data;
+    });
+    this.getDicts("f_ifinspection").then((response) => {
+      this.ifinspectionList = response.data;
+    });
+    this.getDicts("f_ifsampling").then((response) => {
+      this.ifsamplingList = response.data;
+    });
+    this.getDicts("f_ifweight_recovery").then((response) => {
+      this.ifweightRecoveryList = response.data;
+    });
     this.getConfigKey("stockoi").then((response) => {
       this.stockoi = response.msg;
     });
@@ -3424,6 +3626,7 @@ export default {
         this.$set(this.form, "fItemsStatus", 1);
       });
     },
+    TFformdata() {},
     getForm() {
       getWarehousebills(this.chiId).then((response) => {
         this.form = response.data.warehousebills;
@@ -3434,6 +3637,57 @@ export default {
           this.approvalStatus = true;
           this.browseStatus = false;
         }
+        this.$set(
+          this.form,
+          "sendSampleDate",
+          Date.parse(this.form.sendSampleDate)
+        );
+        this.$set(
+          this.form,
+          "weightRecoveryDate",
+          Date.parse(this.form.weightRecoveryDate)
+        );
+        this.$set(
+          this.form,
+          "fWeighingDate",
+          Date.parse(this.form.fWeighingDate)
+        );
+        this.$set(
+          this.form,
+          "fBusinessAttribution",
+          this.form.fBusinessAttribution
+            ? this.form.fBusinessAttribution.toString()
+            : null
+        );
+        this.$set(
+          this.form,
+          "fDeclarationElements",
+          this.form.fDeclarationElements
+            ? this.form.fDeclarationElements.toString()
+            : null
+        );
+        this.$set(
+          this.form,
+          "fIfinspection",
+          this.form.fIfinspection || this.form.fIfinspection == 0
+            ? this.form.fIfinspection.toString()
+            : null
+        );
+        this.$set(
+          this.form,
+          "fIfsampling",
+          this.form.fIfsampling || this.form.fIfsampling == 0
+            ? this.form.fIfsampling.toString()
+            : null
+        );
+        this.$set(
+          this.form,
+          "fIfweightRecovery",
+          this.form.fIfweightRecovery || this.form.fIfweightRecovery == 0
+            ? this.form.fIfweightRecovery.toString()
+            : null
+        );
+
         this.$set(this.form, "fEta", Date.parse(this.form.fEta));
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
         this.$set(this.form, "fBstime", Date.parse(this.form.fBstime));
@@ -3754,6 +4008,57 @@ export default {
               if ((response.code = 200)) {
                 this.mblnoStatus = "";
                 this.form = response.data.warehouseBills;
+                this.$set(
+                  this.form,
+                  "sendSampleDate",
+                  Date.parse(this.form.sendSampleDate)
+                );
+                this.$set(
+                  this.form,
+                  "weightRecoveryDate",
+                  Date.parse(this.form.weightRecoveryDate)
+                );
+                this.$set(
+                  this.form,
+                  "fWeighingDate",
+                  Date.parse(this.form.fWeighingDate)
+                );
+                this.$set(
+                  this.form,
+                  "fBusinessAttribution",
+                  this.form.fBusinessAttribution
+                    ? this.form.fBusinessAttribution.toString()
+                    : null
+                );
+                this.$set(
+                  this.form,
+                  "fDeclarationElements",
+                  this.form.fDeclarationElements
+                    ? this.form.fDeclarationElements.toString()
+                    : null
+                );
+                this.$set(
+                  this.form,
+                  "fIfinspection",
+                  this.form.fIfinspection || this.form.fIfinspection == 0
+                    ? this.form.fIfinspection.toString()
+                    : null
+                );
+                this.$set(
+                  this.form,
+                  "fIfsampling",
+                  this.form.fIfsampling || this.form.fIfsampling == 0
+                    ? this.form.fIfsampling.toString()
+                    : null
+                );
+                this.$set(
+                  this.form,
+                  "fIfweightRecovery",
+                  this.form.fIfweightRecovery ||
+                    this.form.fIfweightRecovery == 0
+                    ? this.form.fIfweightRecovery.toString()
+                    : null
+                );
                 this.$set(this.form, "fEta", Date.parse(this.form.fEta));
                 this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
                 this.$set(this.form, "fBstime", Date.parse(this.form.fBstime));
@@ -4071,8 +4376,12 @@ export default {
             this.importList.fQty = this.Printinglist[0].fQty;
             this.importList.fGrossweight = this.Printinglist[0].fGrossweight;
             this.importList.fNetweight = this.Printinglist[0].fNetweight;
-            this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
-            this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
+            this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(
+              2
+            );
+            this.tfGrossweightnum2 = (
+              this.importList.fGrossweight / 1000
+            ).toFixed(2);
           }
           console.log(this.importList);
           this.weightList = true;

src/views/morePage/stock/index.vue

@@ -520,6 +520,7 @@ export default {
     });
     this.getList();
     this.getRow();
+    console.log(Cookies.get("sysType"))
   },
   methods: {
     //列设置全选
@@ -689,7 +690,6 @@ export default {
             }
           }
         });
-        console.log(response)
         this.selectAuditList = response.rows;
         this.total = response.total;
         this.loading = false;