build

src/views/sellOut/sellAfterApply/components/supplier-confirm.vue

@@ -162,7 +162,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 400px;
+    width: 600px;
   }
 }
 </style>

src/views/sellOut/sellAfterApply/components/supplier_exam.vue

@@ -160,7 +160,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 400px;
+    width: 600px;
   }
 }
 </style>

src/views/sellOut/sellAfterApply/components/wait-return.vue

@@ -1,11 +1,11 @@
 <template>
   <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
-    <el-form-item label="是否退货" prop="is_th">
+    <!-- <el-form-item label="是否退货" prop="is_th">
       <el-select v-model="formData.is_th" style="width:100%">
         <el-option label="是" value="1" />
         <el-option label="否" value="2" />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
     <template v-if="displayExpressField">
       <el-form-item label="物流公司" prop="company">
@@ -120,7 +120,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 400px;
+    width: 600px;
   }
 }
 </style>

src/views/sellOut/sellAfterApply/detail.vue

@@ -108,7 +108,7 @@
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
             
-            <el-collapse-item
+            <!-- <el-collapse-item
               title="设置退货仓库"
               name="4"
               v-if="
@@ -123,7 +123,7 @@
                 v-if="newTime != ''"
                 @refresh="initData"
               ></express-feedback>
-            </el-collapse-item>
+            </el-collapse-item> -->
           </el-collapse>
         </el-tab-pane>
 

src/views/sellOut/sellReturn/components/approval-results.vue

@@ -129,7 +129,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 500px;
+    width: 600px;
   }
 }
 </style>

src/views/sellOut/sellReturn/components/comExamForm.vue

@@ -1,8 +1,8 @@
 <template>
   <el-form
+    ref="ruleForm"
     :model="ruleForm"
     status-icon
-    ref="ruleForm"
     :size="'mini'"
     :rules="rulesThis"
     label-width="95px"
@@ -22,20 +22,19 @@
               :key="item.value"
               :label="item.label"
               :value="item.value"
-            >
-            </el-option>
+            />
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="19" v-show="ruleForm.is_th + '' === '1'">
+      <el-col v-show="ruleForm.is_th + '' === '1'" :span="19">
         <el-form-item label="退货备注" prop="remark">
           <el-input
+            v-model="ruleForm.remark"
             type="textarea"
             maxlength="250"
             :disabled="disabled"
             show-word-limit
             placeholder="请填写备注"
-            v-model="ruleForm.remark"
           />
         </el-form-item>
       </el-col>
@@ -52,7 +51,7 @@
           />
         </el-form-item>
       </el-col> -->
-      <el-col :span="19" v-show="ruleForm.is_th + '' === '0'">
+      <el-col v-show="ruleForm.is_th + '' === '0'" :span="19">
         <el-form-item prop="return_wsm" label-width="10px">
           <!-- :disabled="sitem.companyNo === ''" -->
           <!-- :companyNo="sitem.companyNo" -->
@@ -62,120 +61,120 @@
             :disabled="disabled || ruleForm.return_company.length === 0"
             :value="ruleForm.return_wsm"
             :placeholder="'仓库名称'"
-            :isRelation="true"
-            :isDetail="disabled"
+            :is-relation="true"
+            :is-detail="disabled"
             :wsmtype="'5'"
-            :companyNo="sitem.supplierNo"
+            :company-no="sitem.supplierNo"
             :names="disabled ? wsm_name : ''"
             @searchChange="change_return_wsm"
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="text-align: right; padding: 0 0 15px 0" v-if="!disabled">
-        <el-button type="primary" @click="submitForm" :size="'mini'">保 存 </el-button>
+      <el-col v-if="!disabled" :span="24" style="text-align: right; padding: 0 0 15px 0">
+        <el-button type="primary" :size="'mini'" @click="submitForm">保 存 </el-button>
       </el-col>
     </el-row>
   </el-form>
 </template>
 
 <script>
-import asyncRequest from "@/apis/service/sellOut/sellReturn";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/service/sellOut/sellReturn'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "sellReturn",
-  props: ["showModel", "disabled", "sitem", "newTime"],
+  name: 'SellReturn',
   mixins: [resToken],
+  props: ['showModel', 'disabled', 'sitem', 'newTime'],
   data() {
     return {
       loading: false,
-      wsm_supplier: "",
-      wsm_name: "",
+      wsm_supplier: '',
+      wsm_name: '',
       showModelThis: this.showModel,
       options: [
         {
-          value: "1",
-          label: "同意退回",
+          value: '1',
+          label: '同意退回'
         },
         {
-          value: "0",
-          label: "不同意退回",
-        },
+          value: '0',
+          label: '不同意退回'
+        }
       ],
-      return_company: "",
+      return_company: '',
       ruleForm: {
-        is_th: "1",
-        returnCode: "", //发货申请单编号
-        remark: "", //退货备注
+        is_th: '1',
+        returnCode: '', // 发货申请单编号
+        remark: '', // 退货备注
         return_company: [],
-        return_wsm: [], //退货原因
+        return_wsm: [] // 退货原因
       },
       rulesThis: this.rules,
       rules: {
         returnCode: [
           {
             required: true,
-            message: "退货单编号不能为空！",
-            trigger: "blur",
-          },
+            message: '退货单编号不能为空！',
+            trigger: 'blur'
+          }
         ],
         is_th: [
           {
             required: true,
-            message: "请选择供应商反馈意见！",
-            trigger: "change",
-          },
+            message: '请选择供应商反馈意见！',
+            trigger: 'change'
+          }
         ],
         remark: [
           {
             required: true,
-            message: "请输入退货备注！",
-            trigger: "blur",
-          },
+            message: '请输入退货备注！',
+            trigger: 'blur'
+          }
         ],
         return_company: [
           {
-            type: "array",
+            type: 'array',
             required: true,
-            message: "请选择仓库所在公司！",
-            trigger: "change",
-          },
+            message: '请选择仓库所在公司！',
+            trigger: 'change'
+          }
         ],
         return_wsm: [
           {
-            type: "array",
+            type: 'array',
             required: true,
-            message: "请选择供仓库！",
-            trigger: "change",
-          },
-        ],
-      },
-    };
-  },
-  mounted() {
-    this.initForm();
+            message: '请选择供仓库！',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
-        this.initForm();
+        this.initForm()
       }
-    },
+    }
+  },
+  mounted() {
+    this.initForm()
   },
 
   methods: {
     async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          console.log(this.sitem);
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          console.log(this.sitem)
           const {
             returnCode,
             error_msg,
@@ -184,85 +183,85 @@ export default {
             return_wsm,
             wsm_supplierNo,
             wsm_supplier,
-            wsm_name,
-          } = this.sitem;
-          this.wsm_supplier = wsm_supplier || "";
-          this.wsm_name = wsm_name || "";
-          console.log(this.disabled, this.wsm_supplier, this.wsm_name);
+            wsm_name
+          } = this.sitem
+          this.wsm_supplier = wsm_supplier || ''
+          this.wsm_name = wsm_name || ''
+          console.log(this.disabled, this.wsm_supplier, this.wsm_name)
           this.ruleForm = {
-            is_th: is_th || "1",
-            returnCode: returnCode || "",
-            remark: remark || "", //退货备注
-            error_msg: error_msg || "", //退货原因
+            is_th: is_th || '1',
+            returnCode: returnCode || '',
+            remark: remark || '', // 退货备注
+            error_msg: error_msg || '', // 退货原因
             return_company: wsm_supplierNo ? [wsm_supplierNo] : [],
-            return_wsm: return_wsm ? [return_wsm] : [],
-          };
-          this.is_th_change();
+            return_wsm: return_wsm ? [return_wsm] : []
+          }
+          this.is_th_change()
         }
-      });
+      })
     },
     // 选择仓库
     change_return_wsm(e) {
-      console.log(e);
-      const { code } = e;
-      this.ruleForm.return_wsm = code ? [code] : [];
-      console.log(this.ruleForm.return_wsm);
-      this.$refs.ruleForm.validateField("return_wsm");
+      console.log(e)
+      const { code } = e
+      this.ruleForm.return_wsm = code ? [code] : []
+      console.log(this.ruleForm.return_wsm)
+      this.$refs.ruleForm.validateField('return_wsm')
     },
     // 选择供应商
     selectSupplierStock(e) {
-      const { code } = e;
-      this.ruleForm.return_company = code ? [code] : [];
-      this.return_company = code || "";
-      this.ruleForm.return_wsm = [];
-      this.$refs.ruleForm.validateField("return_company");
-      this.$refs.ruleForm.validateField("return_wsm");
+      const { code } = e
+      this.ruleForm.return_company = code ? [code] : []
+      this.return_company = code || ''
+      this.ruleForm.return_wsm = []
+      this.$refs.ruleForm.validateField('return_company')
+      this.$refs.ruleForm.validateField('return_wsm')
     },
     is_th_change() {
-      const { is_th } = this.ruleForm;
-      this.rulesThis.remark[0].required = is_th + "" === "1";
-      this.rulesThis.return_company[0].required = is_th + "" === "0";
-      this.rulesThis.return_wsm[0].required = is_th + "" === "0";
+      const { is_th } = this.ruleForm
+      this.rulesThis.remark[0].required = is_th + '' === '1'
+      this.rulesThis.return_company[0].required = is_th + '' === '0'
+      this.rulesThis.return_wsm[0].required = is_th + '' === '0'
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          if (model.is_th + "" === "0") {
-            model.remark = "";
+          this.loading = true
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          if (model.is_th + '' === '0') {
+            model.remark = ''
           } else {
-            model.return_wsm = [];
+            model.return_wsm = []
           }
-          delete model["return_company"];
-          model.status = "3";
-          model.return_wsm = model.return_wsm.toString();
-          const { code, data, message } = await asyncRequest.status(model);
-          this.loading = false;
+          delete model['return_company']
+          model.status = '3'
+          model.return_wsm = model.return_wsm.toString()
+          const { code, data, message } = await asyncRequest.status(model)
+          this.loading = false
           if (code === 0) {
             this.$notify.success({
-              title: "提交成功！",
-              message: "",
-            });
-            this.showModelThis = false;
+              title: '提交成功！',
+              message: ''
+            })
+            this.showModelThis = false
             // 刷新
-            this.$emit("refresh", false);
+            this.$emit('refresh', false)
           } else if (code >= 100 && code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(message);
+            this.$message.warning(message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style></style>

src/views/sellOut/sellReturn/index.vue

@@ -112,8 +112,8 @@
               </el-col>
             </el-row>
 
-            <el-row>
-              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+            <el-row style="margin-top:10px">
+              <el-col :span="6" style="width: 400px;">
                   <el-input
                     clearable
                     placeholder="关键字"

src/views/supplierSellOut/supplierSellAfterApply/components/supplier-confirm.vue

@@ -162,7 +162,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 400px;
+    width: 800px;
   }
 }
 </style>

src/views/supplierSellOut/supplierSellAfterApply/components/supplier_exam.vue

@@ -160,7 +160,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 400px;
+    width: 600px;
   }
 }
 </style>

src/views/supplierSellOut/supplierSellAfterApply/components/wait-return.vue

@@ -1,11 +1,11 @@
 <template>
   <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
-    <el-form-item label="是否退货" prop="is_th">
+    <!-- <el-form-item label="是否退货" prop="is_th">
       <el-select v-model="formData.is_th" style="width:100%">
         <el-option label="是" value="1" />
         <el-option label="否" value="2" />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
     <template v-if="displayExpressField">
       <el-form-item label="物流公司" prop="company">
@@ -120,7 +120,7 @@ export default {
 <style lang="scss" scoped>
 .supplier-form{
   ::v-deep(.el-form-item){
-    width: 400px;
+    width: 600px;
   }
 }
 </style>

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -109,7 +109,7 @@
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
             
-            <el-collapse-item
+            <!-- <el-collapse-item
               title="设置退货仓库"
               name="4"
               v-if="
@@ -124,7 +124,7 @@
                 v-if="newTime != ''"
                 @refresh="initData"
               ></express-feedback>
-            </el-collapse-item>
+            </el-collapse-item> -->
           </el-collapse>
         </el-tab-pane>