build

src/components/globalComponents/process-time-line/main.vue

@@ -8,9 +8,9 @@
       :process-status="finishStatus"
     >
       <el-step
-        icon="el-icon-success"
         v-for="(item, index) in options"
         :key="item.time + index"
+        icon="el-icon-success"
         :finish-status="finishStatus"
         :process-status="finishStatus"
         style="margin: 0 0 0 150px; position: relative"
@@ -23,9 +23,9 @@
         </div>
 
         <div
+          v-if="index + 1 !== options.length"
           slot="description"
           style="padding: 20px 0 0 0"
-          v-if="index + 1 !== options.length"
         >
           <p class="name">
             &nbsp;操&nbsp;作&nbsp;人&nbsp;：
@@ -35,6 +35,10 @@
             账号来源：
             {{ item.source + "" === "2" ? "供应商端" : "采销平台" }}
           </p>
+          <p class="item">
+            账号等级：
+            {{ item.level + "" === "1" ? "超管" : item.level + "" === "2" ? "业务公司" : "供应商" }}
+          </p>
           <p class="time">
             {{ item.addtime }}
           </p>
@@ -45,48 +49,48 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/process-time-line";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/components/process-time-line'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "processTimeLine",
-  props: ["type", "orderCode", "newTime"],
+  name: 'ProcessTimeLine',
   mixins: [resToken],
+  props: ['type', 'orderCode', 'newTime'],
   data() {
     return {
       options: [],
-      loading: false,
-    };
+      loading: false
+    }
   },
   watch: {
-    newTime: function (val) {
+    newTime: function(val) {
       if (val) {
-        this.getList();
+        this.getList()
       }
-    },
+    }
   },
   mounted() {
-    this.getList();
+    this.getList()
   },
 
   methods: {
     async getList() {
       if (!this.loading) {
-        this.loading = true;
-        this.options = [];
+        this.loading = true
+        this.options = []
         const res = await asyncRequest.list({
           type: this.type,
-          orderCode: this.orderCode,
-        });
+          orderCode: this.orderCode
+        })
         if (res && res.code === 0 && res.data) {
-          this.options = res.data;
+          this.options = res.data
         } else {
-          this.options = [];
+          this.options = []
         }
-        this.loading = false;
+        this.loading = false
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss">
 .date-picker.el-input {

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -88,12 +88,6 @@ export default [
     label: '供应商名称',
     width: '160'
   },
-  {
-    prop: 'supplierNo',
-    label: '供应商编号 ',
-    width: '160'
-  },
-
   // {
   //   prop: 'send_status',
   //   label: '分单状态',

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

@@ -16,7 +16,6 @@
           <el-select
             disabled
             style="width: 100%"
-            disabled
             v-model="ruleForm.is_receive"
             @change="is_receive_change"
             placeholder="期望结果"
@@ -319,6 +318,7 @@ export default {
       this.rulesThis = this.rules;
       this.disabled = false;
       await this.resetForm();
+      await this.is_receive_change()
       this.loading = false;
     },
     async initData() {

src/views/sellOut/sellReturn/columns.js

@@ -20,7 +20,7 @@ export default [
     prop: 'status',
     label: '状态',
     _slot_: 'status',
-    width: '180px'
+    width: '120px'
   },
   {
     prop: 'order_type',

src/views/sellOut/sellReturn/components/ShowDataTableColumns.js

@@ -65,13 +65,18 @@ const showColumns = [
   {
     prop: 'addtime',
     label: '创建时间',
-    span: 7
+    span: 4
+  },
+  {
+    prop: 'is_addr',
+    label: '退货类型',
+    span: 4
   },
   {
     prop: 'send_type',
     label: '下单方式',
     _slot_: 'send_type',
-    span: 5
+    span: 4
   },
   {
     prop: 'loop_total',
@@ -88,14 +93,7 @@ const showColumns = [
     prop: 'remark',
     label: '备注',
     span: 24
-  },
-  {
-    prop: 'addrinfo',
-    label: '发货信息',
-    _slot_: 'addrinfo',
-    span: 24
   }
-
 ]
 
 export { showColumns }

src/views/sellOut/sellReturn/detail.vue

@@ -33,6 +33,10 @@
                   ></el-tag>
                 </template>
 
+                <template slot="is_addr">
+                  {{String(sitem.is_addr) === '1' ? '有地址退货' : '无地址退货'}}
+                </template>
+
                 <template slot="supplierName">
                   <span>{{ sitem.supplier_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
@@ -136,7 +140,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="发货信息" name="8">
+            <el-collapse-item title="发货信息" name="8" v-if="sitem && sitem.is_addr === '1'">
               <child-list :sitem="sitem" />
             </el-collapse-item>
             

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -175,7 +175,7 @@
               </el-col> -->
 
                 <div style="float: right;" v-if="powers.includes('087')">
-                  <el-button type="primary" size="mini" @click="handleExport">发货工单导出</el-button>
+                  <el-button type="primary" size="mini" @click="handleExsport">发货工单导出</el-button>
                </div>
 
                <div style="margin-right: 10px;float: right">
@@ -571,9 +571,8 @@ export default {
         ...model,
         [this.select]: this.s_input,
         customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
-        // supplierNo: this.currentCompany,
+        supplierNo: this.currentCompany,
         noRelation: true
-        // needRela: true
       });
 
       if (res && res.code === 0 && res.data) {

src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -291,7 +291,17 @@ export default {
         return
       }
 
-      const returnCode = this.select_list.map(({returnCode}) => returnCode)
+      this.parmValue.returnCode =
+        this.select === "returnCode" ? this.s_input : "";
+      this.parmValue.orderCode =
+        this.select === "orderCode" ? this.s_input : "";
+      this.parmValue.apply_name =
+        this.select === "apply_name" ? this.s_input : "";
+      this.parmValue.company_name =
+        this.select === "company_name" ? this.s_input : "";
+      this.parmValue.good_code = this.select === "good_code" ? this.s_input : "";
+      this.parmValue.skuCode = this.select === "skuCode" ? this.s_input : "";
+      let model = JSON.parse(JSON.stringify(this.parmValue));
 
       if (!this.loading) {
         this.loading = true;
@@ -300,7 +310,11 @@ export default {
           method: "post",
           url: this.fileUrl +  "/admin/reorderExport",
           responseType: "blob",
-          data: {returnCode},
+          data: {
+            ...model,
+            noRelation: true,
+            supplierNo: this.currentCompany,
+          },
           headers: {
             Accept: httpType,
           },
@@ -440,9 +454,7 @@ export default {
       this.parmValue.company_name =
         this.select === "company_name" ? this.s_input : "";
       this.parmValue.good_code = this.select === "good_code" ? this.s_input : "";
-
       this.parmValue.skuCode = this.select === "skuCode" ? this.s_input : "";
-
       let model = JSON.parse(JSON.stringify(this.parmValue));
 
       const res = await asyncRequest.list({