From fe203d6616f70695ab8973c75220f74ae91333bc Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 18 十月 2023 16:09:55 +0800
Subject: [PATCH] bug修复(5285)

---
 src/views/warehouseManage/bussinessType/AddBussinessType.vue |  104 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/src/views/warehouseManage/bussinessType/AddBussinessType.vue b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
index 59d57c9..17a84e9 100644
--- a/src/views/warehouseManage/bussinessType/AddBussinessType.vue
+++ b/src/views/warehouseManage/bussinessType/AddBussinessType.vue
@@ -36,7 +36,7 @@
           <div class="basic-info-view">
             <div class="purchase-view">
               <div class="left">
-                <el-form-item label="鍏ュ簱绫诲瀷" prop="name">
+                <el-form-item label="涓氬姟绫诲瀷" prop="name">
                   <el-input
                     v-model="editConfig.infomation.name"
                     placeholder="璇峰~鍐�"
@@ -56,30 +56,25 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-
-                <el-form-item label="搴忓彿鍓嶇紑" prop="prefix">
-                  <el-input
-                    v-model="editConfig.infomation.prefix"
-                    placeholder=""
-                    :disabled="!showFooter"
-                    style="width: 100%"
-                  ></el-input>
-                </el-form-item>
-                <el-form-item label="浠撳簱" prop="warehouseId">
+                <el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId">
                   <el-select
-                    v-model="editConfig.infomation.warehouseId"
+                    v-model="editConfig.infomation.defaultLocationSrcId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
                     style="width: 100%"
                     :disabled="!showFooter"
                   >
-                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
+                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="榛樿婧愪綅缃�" prop="defaultLocationSrcId">
+                <el-form-item
+                  v-if="editConfig.infomation.baseOperationType !== 1"
+                  label="榛樿鐩殑浣嶇疆"
+                  prop="defaultLocationDestId"
+                >
                   <el-select
-                    v-model="editConfig.infomation.defaultLocationSrcId"
+                    v-model="editConfig.infomation.defaultLocationDestId"
                     placeholder="璇烽�夋嫨"
                     size="mini"
                     style="width: 100%"
@@ -104,7 +99,54 @@
                 </el-form-item> -->
               </div>
               <div class="right">
+                <el-form-item label="搴忓彿鍓嶇紑" prop="prefix">
+                  <el-input
+                    v-model="editConfig.infomation.prefix"
+                    placeholder=""
+                    :disabled="!showFooter"
+                    style="width: 100%"
+                  ></el-input>
+                </el-form-item>
                 <el-form-item
+                  v-if="editConfig.infomation.baseOperationType !== 1"
+                  label="淇濈暀鏂瑰紡"
+                  prop="reservationMethod"
+                >
+                  <el-radio-group v-model="editConfig.infomation.reservationMethod" :disabled="!showFooter">
+                    <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id"
+                      >{{ item.name }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="浠撳簱" prop="warehouseId">
+                  <el-select
+                    v-model="editConfig.infomation.warehouseId"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 100%"
+                    :disabled="!showFooter"
+                  >
+                    <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item
+                  v-if="editConfig.infomation.baseOperationType === 1"
+                  label="榛樿鐩殑浣嶇疆"
+                  prop="defaultLocationDestId"
+                >
+                  <el-select
+                    v-model="editConfig.infomation.defaultLocationDestId"
+                    placeholder="璇烽�夋嫨"
+                    size="mini"
+                    style="width: 100%"
+                    :disabled="!showFooter"
+                  >
+                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <!-- <el-form-item
                   v-if="editConfig.infomation.baseOperationType"
                   label="閫�璐х被鍨�"
                   prop="returnOperationTypeID"
@@ -146,32 +188,7 @@
                   prop="earlyOperations"
                 >
                   <el-checkbox v-model="editConfig.infomation.earlyOperations" :disabled="!showFooter"></el-checkbox>
-                </el-form-item>
-                <el-form-item
-                  v-if="editConfig.infomation.baseOperationType !== 1"
-                  label="淇濈暀鏂瑰紡"
-                  prop="reservationMethod"
-                >
-                  <el-radio-group v-model="editConfig.infomation.reservationMethod" :disabled="!showFooter">
-                    <!-- <div style="margin-top: 8px"> -->
-                    <el-radio v-for="item in reservationMethodList" :key="item.id" :value="item.id" :label="item.id"
-                      >{{ item.name }}
-                    </el-radio>
-                    <!-- </div> -->
-                  </el-radio-group>
-                </el-form-item>
-                <el-form-item label="榛樿鐩殑浣嶇疆" prop="defaultLocationDestId">
-                  <el-select
-                    v-model="editConfig.infomation.defaultLocationDestId"
-                    placeholder="璇烽�夋嫨"
-                    size="mini"
-                    style="width: 100%"
-                    :disabled="!showFooter"
-                  >
-                    <el-option v-for="item in positionlist" :key="item.id" :label="item.name" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
+                </el-form-item> -->
               </div>
             </div>
           </div>
@@ -179,7 +196,6 @@
       </el-form>
       <!-- 灏� -->
       <div slot="footer" class="dialog-footer">
-        <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> -->
         <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
         <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
       </div>
@@ -217,7 +233,7 @@
       dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
-        // 鍏ュ簱绫诲瀷
+        // 涓氬姟绫诲瀷
         name: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
         // 鍓嶇紑
         prefix: [{ required: true, message: "璇疯緭鍏�", trigger: "change" }],
@@ -310,7 +326,7 @@
       let data = JSON.parse(JSON.stringify(this.editConfig.infomation))
 
       let params = {
-        // 鍏ュ簱绫诲瀷
+        // 涓氬姟绫诲瀷
         name: data.name,
         // 鍓嶇紑
         prefix: data.prefix,

--
Gitblit v1.8.0