build

dist/static/js/app.js

@@ -2548,7 +2548,7 @@ eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../.
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \".hasborder[data-v-ecf3733a] {\\n  border-bottom: 1px solid #ebeef5 !important;\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack:///./src/components/globalComponents/show-data-table/main.vue?./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--8-oneOf-1-2!./node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options");
+eval("// Imports\nvar ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ../../../../node_modules/css-loader/dist/runtime/api.js */ \"./node_modules/css-loader/dist/runtime/api.js\");\nexports = ___CSS_LOADER_API_IMPORT___(false);\n// Module\nexports.push([module.i, \".show-data-table .label[data-v-ecf3733a] {\\n  white-space: nowrap;\\n}\\n.hasborder[data-v-ecf3733a] {\\n  border-bottom: 1px solid #ebeef5 !important;\\n}\\n\", \"\"]);\n// Exports\nmodule.exports = exports;\n\n\n//# sourceURL=webpack:///./src/components/globalComponents/show-data-table/main.vue?./node_modules/css-loader/dist/cjs.js??ref--8-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--8-oneOf-1-2!./node_modules/sass-loader/dist/cjs.js??ref--8-oneOf-1-3!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options");
 
 /***/ }),
 

src/components/globalComponents/show-data-table/main.vue

@@ -74,6 +74,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+.show-data-table{
+  .label{
+    white-space: nowrap;
+  }
+}
 .hasborder {
   border-bottom: 1px solid #ebeef5 !important;
 }

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

@@ -25,6 +25,10 @@
           @selectChange="addr_selectChange"
         />
       </el-form-item>
+
+      <el-form-item label="详细地址" prop="addr">
+        <el-input v-model="formData.addr" placeholder="详细地址" />
+      </el-form-item>
     </template>
 
     <el-form-item>
@@ -67,7 +71,8 @@ export default {
         remark: '',
         contactor: '',
         mobile: '',
-        addr_code: ''
+        addr_code: '',
+        addr: ''
       },
       statusOptions: [
         { value: '4', label: '通过' }, // -> 待客户退货
@@ -82,6 +87,13 @@ export default {
     rules() {
       const { status } = this.formData
       return ({
+        addr: [
+          {
+            required: true,
+            trigger: 'change',
+            message: '请输入详细地址'
+          }
+        ],
         status: [
           {
             required: true,

src/views/sellOut/sellAfterApply/detail.vue

@@ -96,8 +96,7 @@
             <el-collapse-item name="4" title="供应商驳回，待采购审核"  v-if="!isSupertube && String(sitem.status) === '2' && this.ppowers.includes('2')">
               <purchase-exam :sitem="sitem" @changeStatus="handlePurchaseConfirm" />
             </el-collapse-item>
-
-            <el-collapse-item name="5" title="供应商审核"   v-if="!isSupertube && String(sitem.status) === '9' && this.ppowers.includes('9')">
+            <el-collapse-item name="5" title="供应商审核" v-if="!isSupertube && String(sitem.status) === '9' && this.ppowers.includes('9')">
               <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />
             </el-collapse-item>
 

src/views/sellOut/sellOutOrder/components/addEditA.vue

@@ -15,8 +15,7 @@
     <!-- <p>orderCode{{ sitem }}</p> -->
     <!-- <p>outCode{{ outCode }}</p> -->
 
-
-    <el-card style="margin-top: -20px" v-loading="loading">
+    <el-card v-loading="loading" style="margin-top: -20px">
       <add-edit-form-a
         v-if="showModel"
         :id="id"
@@ -30,60 +29,60 @@
   </el-dialog>
 </template>
 <script>
-import addEditFormA from "./addEditFormA";
+import addEditFormA from './addEditFormA'
 export default {
-  name: "handover",
-  props: ["showModel", "id", "isDetail", "sitem"],
+  name: 'Handover',
   components: {
-    addEditFormA,
+    addEditFormA
   },
+  props: ['showModel', 'id', 'isDetail', 'sitem'],
   data() {
     return {
       sitem: null,
-      title: "",
-      showModelThis: this.showModel,
-    };
+      title: '',
+      showModelThis: this.showModel
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    
+
     async initForm() {
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建售后申请";
-        this.rulesThis = this.rules;
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建售后申请'
+        this.rulesThis = this.rules
       } else {
         if (this.isDetail) {
-          this.rulesThis = {};
+          this.rulesThis = {}
         } else {
-          this.rulesThis = this.rules;
+          this.rulesThis = this.rules
         }
       }
-      this.loading = false;
+      this.loading = false
     },
     handClick(e) {
-      console.log(e);
-      this.showModelThis = e;
+      console.log(e)
+      this.showModelThis = e
     },
     refresh(e) {
-      console.log(e);
-      this.showModelThis = e;
-      this.$emit("refresh", true);
-    },
-  },
-};
+      console.log(e)
+      this.showModelThis = e
+      this.$emit('refresh', true)
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/sellOut/sellOutOrder/components/addEditFormA.vue

@@ -11,14 +11,14 @@
     class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="6">
-        <el-form-item label="收货情况" prop="is_receive">
+      <el-col :span="24">
+        <el-form-item label-width="110px" label="售后期望结果" prop="is_receive">
           <el-select
             style="width: 100%"
             :disabled="disabled"
             v-model="ruleForm.is_receive"
             @change="is_receive_change"
-            placeholder="收货情况"
+            placeholder="售后期望结果"
           >
             <el-option
               v-for="item in is_receive_options"
@@ -29,6 +29,9 @@
             </el-option>
           </el-select>
         </el-form-item>
+      </el-col>
+
+      <el-col :span="6">
         <el-form-item label="发货总量" prop="send_num" required>
           <el-input
             disabled
@@ -184,11 +187,11 @@ export default {
       is_receive_options: [
         {
           value: "1",
-          label: "已收到货",
+          label: "销售订单退货，采购订单也退货",
         },
         {
           value: "0",
-          label: "未收到货",
+          label: "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)",
         },
       ],
       resign_name: "", //离职人

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

@@ -25,6 +25,10 @@
           @selectChange="addr_selectChange"
         />
       </el-form-item>
+
+      <el-form-item label="详细地址" prop="addr">
+        <el-input v-model="formData.addr" placeholder="详细地址" />
+      </el-form-item>
     </template>
 
     <el-form-item>
@@ -67,7 +71,8 @@ export default {
         remark: '',
         contactor: '',
         mobile: '',
-        addr_code: ''
+        addr_code: '',
+        addr: ''
       },
       statusOptions: [
         { value: '4', label: '通过' }, // -> 待客户退货
@@ -110,6 +115,13 @@ export default {
             validator: validatemobile
           }
         ],
+        addr: [
+          {
+            required: true,
+            trigger: 'blur',
+            message: '请输入详细地址'
+          }
+        ],
         addr_code: [
           {
             type: 'array',