主表位置修改

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -85,48 +85,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" v-if="true">
-          <el-form-item label="计费单位" prop="fFeetUnit">
-            <el-select
-                v-model="form.fFeetUnit"
-                placeholder="请选择计费单位"
-                clearable
-                :disabled="browseStatus || form.warehouseStatus > 3||detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
-                style="width: 80%"
-                @change="feeUnitChange"
-            >
-              <el-option
-                  v-for="(item, index) in fFeetUnitOptions"
-                  :key="index.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-else>
-          <el-form-item label="作业类型" prop="fBusinessType">
-            <el-select
-                style="width: 80%"
-                v-model="form.fBusinessType"
-                filterable
-                @change="educationChange"
-                :disabled="
-                browseStatus ||
-                warehouseDrList.length > 0 ||
-                warehouseCrList.length > 0 ||
-                form.warehouseStatus > 3
-              "
-            >
-              <el-option
-                  v-for="(item, index) in businessTypeOption"
-                  :key="index.dictValue"
-                  :label="item.dictLabel"
-                  :value="item.dictValue"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="8">
           <el-form-item label="提单号" prop="fMblno">
             <el-input
@@ -140,6 +98,16 @@
             </el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据编号" prop="fBillno">
+            <el-input
+              v-model="form.fBillno"
+              disabled
+              style="width: 80%"
+              placeholder="单据编号"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -263,16 +231,46 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="箱使日期" prop="freeContainerDate">
-            <el-date-picker
-                v-model="form.freeContainerDate"
-                style="width: 80%"
-                type="date"
-                value-format="timestamp"
-                placeholder="请选择箱使日期"
+        <el-col :span="8" v-if="true">
+          <el-form-item label="计费单位" prop="fFeetUnit">
+            <el-select
+              v-model="form.fFeetUnit"
+              placeholder="请选择计费单位"
+              clearable
+              :disabled="browseStatus || form.warehouseStatus > 3||detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
+              style="width: 80%"
+              @change="feeUnitChange"
             >
-            </el-date-picker>
+              <el-option
+                v-for="(item, index) in fFeetUnitOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-else>
+          <el-form-item label="作业类型" prop="fBusinessType">
+            <el-select
+              style="width: 80%"
+              v-model="form.fBusinessType"
+              filterable
+              @change="educationChange"
+              :disabled="
+                browseStatus ||
+                warehouseDrList.length > 0 ||
+                warehouseCrList.length > 0 ||
+                form.warehouseStatus > 3
+              "
+            >
+              <el-option
+                v-for="(item, index) in businessTypeOption"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              ></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8" v-if="showfCustomno">
@@ -313,7 +311,7 @@
             <el-input
               v-model="form.fPlangrossweight"
               style="width: 80%"
-              v-input-limit="2"
+              v-input-limit="3"
               placeholder="计划毛重"
               maxlength="16"
               :disabled="
@@ -332,7 +330,7 @@
                 v-model="form.fPlannetweight"
                 style="width: 80%"
                 maxlength="16"
-                v-input-limit="2"
+                v-input-limit="3"
                 placeholder="计划净重"
                 @change="changePlannetWeight"
                 :disabled="
@@ -736,13 +734,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="单据编号" prop="fBillno">
-              <el-input
-                  v-model="form.fBillno"
-                  disabled
-                  style="width: 80%"
-                  placeholder="单据编号"
-              />
+            <el-form-item label="箱使日期" prop="freeContainerDate">
+              <el-date-picker
+                v-model="form.freeContainerDate"
+                style="width: 80%"
+                type="date"
+                value-format="timestamp"
+                placeholder="请选择箱使日期"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -1589,7 +1589,7 @@
               <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
                 <el-input
                     v-model="importList.fPlangrossweight"
-                    v-input-limit="2"
+                    v-input-limit="3"
                     style="width: 100%"
                     placeholder="毛重">
                   <template slot="append">{{ (importList.fPlangrossweight / 1000).toFixed(4) }}吨</template>
@@ -1600,7 +1600,7 @@
               <el-form-item label="计划净重(kg)" prop="fPlannetweight">
                 <el-input
                     v-model="importList.fPlannetweight"
-                    v-input-limit="2"
+                    v-input-limit="3"
                     style="width: 100%"
                     placeholder="净重"
                 >
@@ -1625,7 +1625,7 @@
               <el-form-item label="毛重(kg)" prop="fGrossweight">
                 <el-input
                     v-model="importList.fGrossweight"
-                    v-input-limit="2"
+                    v-input-limit="3"
                     style="width: 100%"
                     placeholder="毛重"
                     @change="tfGrossweight2"
@@ -1638,7 +1638,7 @@
               <el-form-item label="净重(kg)" prop="fNetweight">
                 <el-input
                     v-model="importList.fNetweight"
-                    v-input-limit="2"
+                    v-input-limit="3"
                     style="width: 100%"
                     placeholder="净重"
                     @change="tfNetweight2"
@@ -1667,7 +1667,7 @@
                   v-model="importList.fActualWeight"
                   style="width: 100%"
                   placeholder="溢短重"
-                  v-input-limit="2"
+                  v-input-limit="3"
                 >
                   <template slot="append">{{ (importList.fActualWeight / 1000).toFixed(4) }}吨</template>
                 </el-input>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -84,24 +84,6 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="结算方式" prop="fStltypeid">
-            <el-select
-                v-model="form.fStltypeid"
-                placeholder="请选择结算方式"
-                clearable
-                :disabled="browseStatus || form.warehouseStatus > 3"
-                style="width: 80%"
-            >
-              <el-option
-                  v-for="(item, index) in fStltypeOptions"
-                  :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="fMblno">
             <el-input
                 v-model="form.fMblno"
@@ -112,6 +94,16 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="单据编号" prop="fBillno">
+            <el-input
+              v-model="form.fBillno"
+              disabled
+              style="width: 80%"
+              placeholder="单据编号"
+            />
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -252,7 +244,7 @@
           <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
             <el-input
               v-model="form.fPlangrossweight"
-              v-input-limit="2"
+              v-input-limit="3"
               style="width: 80%"
               laceholder="计划毛重"
               maxlength="16"
@@ -271,7 +263,7 @@
                 v-model="form.fPlannetweight"
                 style="width: 80%"
                 maxlength="16"
-                v-input-limit="2"
+                v-input-limit="3"
                 laceholder="计划净重"
                 :disabled="
                 browseStatus || current !== before || form.warehouseStatus > 3
@@ -611,13 +603,21 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="单据编号" prop="fBillno">
-              <el-input
-                  v-model="form.fBillno"
-                  disabled
-                  style="width: 80%"
-                  placeholder="单据编号"
-              />
+            <el-form-item label="结算方式" prop="fStltypeid">
+              <el-select
+                v-model="form.fStltypeid"
+                placeholder="请选择结算方式"
+                clearable
+                :disabled="browseStatus || form.warehouseStatus > 3"
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(item, index) in fStltypeOptions"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">