no message

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -76,7 +76,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="退货仓库" prop="storageStockId">
+              <el-form-item label="退货仓库" prop="storageStockId" :rules="joinCode == 'NO' ? [] : [{ required: true, message: '请选择退货仓库', trigger: 'change' }]">
                 <el-select v-model="formData.storageStockId" placeholder="请选择退货仓库" style="width: 100%;">
 							    <el-option :label="item.storageName" :value="item.storageId" v-for="(item, index) in storageList"
 							      :key="index"></el-option>
@@ -119,7 +119,7 @@
 
           <el-tabs v-model="formTabs">
             <el-tab-pane label="商品信息" name="a"></el-tab-pane>
-            <el-tab-pane label="条码信息" name="b" v-if="joinCode"></el-tab-pane>
+            <el-tab-pane label="条码信息" name="b" v-if="joinCode == 'CODE'"></el-tab-pane>
             <el-tab-pane label="旧机信息" name="c" v-if="formData.isReturnOld === 'YES'"></el-tab-pane>
           </el-tabs>
 
@@ -313,7 +313,7 @@
 
         <el-tabs v-model="detailTabs">
           <el-tab-pane label="商品信息" name="a"></el-tab-pane>
-          <el-tab-pane label="条码信息" name="b" v-if="joinCode"></el-tab-pane>
+          <el-tab-pane label="条码信息" name="b" v-if="joinCode == 'CODE'"></el-tab-pane>
           <el-tab-pane label="旧机信息" name="c" v-if="detailData.isOld == 'YES'"></el-tab-pane>
         </el-tabs>
 
@@ -605,7 +605,7 @@ export default {
       },
       formRules: {
         isReturnOld: [{ required: true, message: '请选择是否退旧机', trigger: 'change' }],
-        storageStockId: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
+        // storageStockId: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
       },
       formType: 'add',
       formVisible: false,
@@ -635,7 +635,7 @@ export default {
       orderList: [],
       waitChooseOrder: [],
 
-      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
+      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
     }
   },
   computed: {
@@ -838,7 +838,7 @@ export default {
     formConfirm(cancel) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          if(!this.formData.storageStockId) return this.$errorMsg('请选择退货仓库');
+          // if(!this.formData.storageStockId) return this.$errorMsg('请选择退货仓库');
 
           salesReturnOrderSave({
             id: this.formData.id || '',
@@ -854,11 +854,11 @@ export default {
                 refundAmount: item.waitRefundPrice,
               }
             }),
-            orderOfflineItemCodes: this.joinCode ? this.codeList : [],
+            orderOfflineItemCodes: this.joinCode == 'CODE' ? this.codeList : [],
             isOld: this.formData.isReturnOld,
             ids: this.oldList.map(o => o.id),
-            storageStockId: this.formData.storageStockId,
-            storageStockName: this.storageList.find(o => o.storageId == this.formData.storageStockId).storageName,
+            storageStockId: this.formData.storageStockId || '',
+            storageStockName: this.formData.storageStockId ? this.storageList.find(o => o.storageId == this.formData.storageStockId).storageName : '',
           }).then(res => {
             this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
             cancel('list')