build

src/apis/user/axios.js

@@ -67,7 +67,6 @@ axios.interceptors.request.use(
     }
     const { noRelation, needRela, relaComNo } = config.data
     const innerRelaComNo = store.state.user.currentCompany
-
     // 决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
     // needRela: 超管需要传递关联公司(默认超管不传递)
     // noRelation: 普通用户不传递关联公司(默认普通用户传递)

src/views/goodStore/active/ladderPrice.vue

@@ -5,47 +5,47 @@
     align="left"
     top="12vh"
     width="1040px"
-    @close="closeModel"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
+    @close="closeModel"
   >
-  <el-card>
+    <el-card>
       <el-row :gutter="10">
         <el-col :span="24">
           <div
             v-if="
               left &&
-              left.header &&
-              left.header.length > 0 &&
-              right &&
-              right.header &&
-              right.header.length > 0
+                left.header &&
+                left.header.length > 0 &&
+                right &&
+                right.header &&
+                right.header.length > 0
             "
           >
             <div class="list-table clearfix">
               <div class="left" :style="{ width: lang }">
                 <div class="header">
                   <div
-                    class="header-item"
                     v-for="(lhead, lhi) in left.header"
                     :key="'lhead' + lhi"
+                    class="header-item"
                   >
                     {{ lhead.spec_name }}
                   </div>
                 </div>
                 <div
-                  class="header-body"
                   v-if="left.spec && left.spec.length > 0"
+                  class="header-body"
                 >
                   <div
-                    class="header-body-row"
                     v-for="(lhr, lhri) in left.spec"
                     :key="'lheadrow' + lhri"
+                    class="header-body-row"
                   >
                     <div
-                      class="heder-body-col"
                       v-for="(lhc, lhci) in lhr"
                       :key="'lheadcol' + lhci"
+                      class="heder-body-col"
                     >
                       {{ lhc.spec_value }}
                     </div>
@@ -55,9 +55,9 @@
               <div class="right" :style="{ paddingLeft: lang }">
                 <div class="header">
                   <div
-                    class="header-col clearfix"
                     v-for="(lhr, lhri) in right.header"
                     :key="'lheadr' + lhri"
+                    class="header-col clearfix"
                   >
                     <div class="header-col-jieti clearfix">
                       <div class="header-col-jieti-title tc clearfix">
@@ -71,18 +71,18 @@
                   </div>
                 </div>
                 <div
-                  class="right-body"
                   v-if="right.spec && right.spec.length > 0"
+                  class="right-body"
                 >
                   <div
-                    class="right-body-col"
                     v-for="(lbr, lbri) in right.spec"
                     :key="'lbodyr' + lbri"
+                    class="right-body-col"
                   >
                     <div
-                      class="right-body-col-item clearfix"
                       v-for="(lbritem, lbritemi) in lbr.limit"
                       :key="'lbritem' + lbritemi"
+                      class="right-body-col-item clearfix"
                     >
                       <div class="right-body-col-item-div fl tc">
                         {{ lbritem.begin_num }}
@@ -104,40 +104,40 @@
     </el-card>
   </el-dialog>
 </template>
-   <script>
+<script>
 export default {
-  name: "active",
-  props: ["showModel", "left", "right", "lang"],
+  name: 'Active',
+  props: ['showModel', 'left', 'right', 'lang'],
   data() {
     return {
       loading: true,
-      title: "商品阶梯价格",
-       showModelThis: this.showModel,
-    };
-  },
-  methods: {
-    closeModel(e) {
-      console.log(e);
-      this.showModelThis = false;
-    },
-    async initForm() {
-      this.loading = false;
-    },
+      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: {
+    closeModel(e) {
+      console.log(e)
+      this.showModelThis = false
+    },
+    async initForm() {
+      this.loading = false
+    }
+  }
+}
 </script>
 
    <style lang="scss" scoped>
@@ -255,4 +255,4 @@ export default {
   }
 }
 </style>
-   
+

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -449,8 +449,7 @@ 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: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-        companyNo: this.currentCompany,
+        supplierNo: this.currentCompany,
         noRelation: true
       });
 

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -164,8 +164,8 @@
                   <el-button type="primary" size="mini" @click="handleExport">发货工单导出</el-button>
                </div>
 
-               <div style="margin-right: 10px;float: right">
-                <el-button v-if="powers.includes('090') && !isSupertube" type="primary"  size="mini" @click="routeGoto('supplierDeliveryWorkOrderSend')"
+               <div style="margin-right: 10px;float: right" v-if="powers.includes('090') && !isSupertube">
+                <el-button type="primary"  size="mini" @click="routeGoto('supplierDeliveryWorkOrderSend')"
                   >批量发货</el-button>
               </div>
             </el-row>
@@ -355,11 +355,6 @@ export default {
     if (back) {
       this.parmValue = JSON.parse(back);
       const { page, size } = this.parmValue;
-      // this.parmValue.start = start || last_start;
-      // this.parmValue.end = end || last_end;
-      // if(this.parmValue.companyNo.length>0){
-      //     this.customerCode = [this.parmValue.companyNo] ;
-      // }
 
       this.pageInfo = {
         size: size,

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -331,8 +331,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: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
-            needRela: true
+            supplierNo: this.currentCompany,
+            noRelation: true
           },
           headers: {
             Accept: httpType,

src/views/supplierSellOut/supplierSellReturn/components/set-work-order.vue

@@ -188,7 +188,12 @@ export default {
           return_num
         }))
 
-        const salesWarehouseParams = { list, type: '1', returnCode: this.sitem.returnCode }
+        const salesWarehouseParams = {
+          list,
+          type: '1',
+          returnCode: this.sitem.returnCode
+        }
+
         const parms = {
           list: [{ return_wsm_code: Array.isArray(this.formData.return_wsm_code)
             ? this.formData.return_wsm_code[0]

src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -89,7 +89,6 @@
               </el-col>
             </el-row>
 
-
             <el-row style="padding: 10px 0 0 0">
               <el-col :span="4" >
                   <search-work-company