审批调拨修改

src/views/startApproval.vue

@@ -22,6 +22,18 @@
             </el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item disabled label="审批日期">
+                <el-date-picker
+                  v-model="dataForm.createTime"
+                  size="large"
+                  type="date"
+                  disabled
+                  value-format="timestamp"
+                  placeholder="审批日期"
+                >
+                </el-date-picker>
+              </el-form-item>
       </div>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -44,7 +56,8 @@ import Global from '@/layout/components/global'
           id: null,
           actId: null,
           auditMsg: null,
-          auditUserId: null
+          auditUserId: null,
+          createTime: new Date
         },
         visible: false,
         optionsBranch: []

src/views/warehouseBusiness/outStock/index.vue

@@ -464,54 +464,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="单据编号" prop="fBillno">
-              <el-input
-                v-model="form.fBillno"
-                style="width: 80%"
-                disabled
-                placeholder="单据编号"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="破损" prop="fifdamage">
-              <el-select
-                v-model="form.fIfdamage"
-                placeholder="请选择是否破损"
-                :disabled="browseStatus || formBrowseStatus"
-                clearable
-                style="width: 80%"
-              >
-                <el-option
-                  v-for="(dict, index) in fIfdamageOptions"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="过磅" prop="fifweigh">
-              <el-select
-                v-model="form.fIfweigh"
-                placeholder="请选择是否过磅"
-                :disabled="browseStatus || formBrowseStatus"
-                clearable
-                style="width: 80%"
-              >
-                <el-option
-                  v-for="(dict, index) in fIfweighOptions"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+
         <el-row>
           <el-col :span="8">
             <el-form-item label="计划件数">
@@ -551,24 +504,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="计费单位" prop="fFeetunit">
-              <el-select
-                v-model="form.fFeetunit"
-                placeholder="请选择计费单位"
-                :disabled="browseStatus || formBrowseStatus"
-                clearable
-                style="width: 80%"
-              >
-                <el-option
-                  v-for="(dict, index) in jFeetunitOptions"
-                  :key="index.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+          
           <el-col :span="8">
             <el-form-item label="车号" prop="fTruckno">
               <el-input
@@ -631,6 +567,24 @@
                 />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="计费单位" prop="fFeetunit">
+              <el-select
+                v-model="form.fFeetunit"
+                placeholder="请选择计费单位"
+                :disabled="browseStatus || formBrowseStatus"
+                clearable
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(dict, index) in jFeetunitOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-form-item label="备注" prop="remark">
@@ -684,6 +638,54 @@
               </el-form-item>
             </el-col>
           </el-row>
+                  <el-row>
+          <el-col :span="8">
+            <el-form-item label="单据编号" prop="fBillno">
+              <el-input
+                v-model="form.fBillno"
+                style="width: 80%"
+                disabled
+                placeholder="单据编号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="破损" prop="fifdamage">
+              <el-select
+                v-model="form.fIfdamage"
+                placeholder="请选择是否破损"
+                :disabled="browseStatus || formBrowseStatus"
+                clearable
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(dict, index) in fIfdamageOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="过磅" prop="fifweigh">
+              <el-select
+                v-model="form.fIfweigh"
+                placeholder="请选择是否过磅"
+                :disabled="browseStatus || formBrowseStatus"
+                clearable
+                style="width: 80%"
+              >
+                <el-option
+                  v-for="(dict, index) in fIfweighOptions"
+                  :key="index.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
           <el-row>
             <el-col :span="8">
               <el-form-item label="制单人" prop="createBy">

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -459,7 +459,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="破损" prop="fifdamage">
               <el-select
                 v-model="form.fIfdamage"
@@ -514,54 +514,55 @@
                 />
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="8">
-            <el-form-item label="计划调拨件数">
+            <el-form-item label="品牌" prop="fMarks">
               <el-input
-                v-model="form.fPlanqty"
+                v-model="form.fMarks"
                 style="width: 80%"
-                placeholder="请输入计划调拨件数"
+                disabled
+                placeholder="品牌"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计划调拨净重">
+            <el-form-item label="品名" prop="fProductName">
               <el-input
-                v-model="form.fPlannetweight"
+                v-model="form.fProductName"
                 style="width: 80%"
-                placeholder="请输入计划调拨净重"
+                disabled
+                placeholder="品名"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="计划调拨毛重">
+            <el-form-item label="计划调拨件数">
               <el-input
-                v-model="form.fPlangrossweight"
+                v-model="form.fPlanqty"
                 style="width: 80%"
-                placeholder="请输入计划调拨毛重"
+                placeholder="请输入计划调拨件数"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="品牌" prop="fMarks">
+            <el-form-item label="计划调拨净重">
               <el-input
-                v-model="form.fMarks"
+                v-model="form.fPlannetweight"
                 style="width: 80%"
-                disabled
-                placeholder="品牌"
+                placeholder="请输入计划调拨净重"
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="品名" prop="fProductName">
+            <el-form-item label="计划调拨毛重">
               <el-input
-                v-model="form.fProductName"
+                v-model="form.fPlangrossweight"
                 style="width: 80%"
-                disabled
-                placeholder="品名"
+                placeholder="请输入计划调拨毛重"
               />
             </el-form-item>
           </el-col>
+          
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -799,7 +800,7 @@
           header-align="center"
           width="150px"
           align="center"
-          label="*仓库"
+          label="*调拨仓库"
         >
         </el-table-column>
         <el-table-column
@@ -824,6 +825,7 @@
               filterable
               remote
               style="width: 80%"
+              @change="kqhouseRemoteMethod"
               :remote-method="kqhouseRemoteMethod"
               placeholder="请输入模糊查找"
             >
@@ -4002,9 +4004,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
         fWarehouseid: this.form.fWarehouseid,
-        fName: name
+        // fName: name
       };
+      console.log(this.kqhouseOptions)
       listArea(queryParams).then((response) => {
+        console.log(response)
         this.kqhouseOptions = response.rows;
       });
     },