Quellcode durchsuchen

调拨订单修改

黄梓星 vor 2 Jahren
Ursprung
Commit
97594f3ff6

+ 1 - 1
src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 270px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

+ 1 - 0
src/layout/components/Sidebar/SidebarItem.vue

@@ -17,6 +17,7 @@
         :key="child.path"
         :is-nest="true"
         :item="child"
+        :title="child.meta.title"
         :base-path="resolvePath(child.path)"
         class="nest-menu"
       />

+ 26 - 14
src/views/purchase/transferOrder/add.vue

@@ -158,24 +158,16 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调入仓库">
-              <el-input
-                v-model="basicForm.storageWarehouse"
-                size="small"
-                :disabled="sonDisable"
-                clearable
-                style="width: 200px"
-              />
+              <el-select clearable size="small" v-model="basicForm.storageWarehouse" :disabled="sonDisable" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库')" style="width: 200px">
+                <el-option v-for="item in ruHouseOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调出仓库">
-              <el-input
-                v-model="basicForm.deliveryWarehouse"
-                size="small"
-                :disabled="sonDisable"
-                clearable
-                style="width: 200px"
-              />
+              <el-select clearable size="small" v-model="basicForm.deliveryWarehouse" :disabled="sonDisable" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调出仓库')" style="width: 200px">
+                <el-option v-for="item in chuHouseOptions" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
             </el-form-item>
          </el-col>
         <el-col :span="1.5">
@@ -619,6 +611,8 @@ export default {
       manOptions: [],
       deptOptions: [],
       currencyOptions: [],
+      ruHouseOptions: [],
+      chuHouseOptions: [],
       liacenterOptions: [],
       basicRules: {},
       materialInfo: [],
@@ -683,6 +677,8 @@ export default {
           if(this.basicForm.businessPersonal) { this.reBackRefer('CONTACTS_PARAM', this.basicForm.businessPersonal) }
           if(this.basicForm.deliveryDept) { this.reBackRefer('DEPT_PARAM', this.basicForm.deliveryDept) }
           if(this.basicForm.currency) { this.reBackRefer('CURRENCY_PARAM', this.basicForm.currency) }
+          if(this.basicForm.storageWarehouse) { this.reBackRefer('WAREHOUSE_PARAM', this.basicForm.storageWarehouse, '调入仓库') }
+          if(this.basicForm.deliveryWarehouse) { this.reBackRefer('WAREHOUSE_PARAM', this.basicForm.deliveryWarehouse, '调出仓库') }
           if(this.basicForm.liacenter) { this.reBackRefer('LIACENTER_PARAM', this.basicForm.liacenter) }
         }
       })
@@ -708,6 +704,12 @@ export default {
         if (type == 'LIACENTER_PARAM') {
           this.liacenterOptions = res.rows
         }
+        if (type == 'WAREHOUSE_PARAM' && title == '调入仓库') {
+          this.ruHouseOptions = res.rows
+        }
+        if (type == 'WAREHOUSE_PARAM' && title == '调出仓库') {
+          this.chuHouseOptions = res.rows
+        }
       })
     },
     addLine() {
@@ -794,6 +796,16 @@ export default {
         this.basicForm.currency = selection[0].id
         this.basicForm.currencyName = selection[0].name
       }
+      if (this.referCondition.title == '调入仓库') {
+        this.ruHouseOptions = selection
+        this.basicForm.storageWarehouse = selection[0].id
+        this.basicForm.storageWarehouseName = selection[0].name
+      }
+      if (this.referCondition.title == '调出仓库') {
+        this.chuHouseOptions = selection
+        this.basicForm.deliveryWarehouse = selection[0].id
+        this.basicForm.deliveryWarehouseName = selection[0].name
+      }
     },
     chooseTreeRefer(type, isPage, title) {
       this.referCondition.type = type

+ 2 - 2
src/views/purchase/transferOrder/index.vue

@@ -8,7 +8,6 @@
               <el-input
               v-model="queryParams.dckczz"
               size="small"
-              placeholder=""
               clearable
               style="width: 200px"
               />
@@ -18,6 +17,7 @@
             <el-form-item label="单据日期">
               <el-date-picker
                style="width: 240px"
+               size="small"
                 v-model="queryParams.billDate"
                 type="daterange"
                 range-separator="至"
@@ -155,7 +155,7 @@
           :total=total>
         </el-pagination>
 
-        <el-tabs style="margin-top: 10px;" type="border-card">
+        <el-tabs style="margin-top: 10px;">
           <el-tab-pane label="物料信息">
             <el-table
             :data="materialInfo"