snow hace 2 años
padre
commit
b00c91036f

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/views/goodStore/supplierGoodsCost/index.vue

@@ -802,7 +802,7 @@ export default {
       // item.companyNo = this.select === "3" ? this.sinput : "";
       item.company_name = this.select === "5" ? this.sinput : ""; // 部门
       item.cat_id = item.cat_id.length > 0 ? item.cat_id[item.cat_id.length - 1] : "";
-      item.supplierNo = this.currentCompany
+      item.companyNo = this.currentCompany
       item.noRelation = true
 
       const res = await asyncRequest.list(item);

+ 10 - 0
src/views/sellOut/sellReturn/columns.js

@@ -22,6 +22,16 @@ export default [
     _slot_: 'order_type',
     width: '85'
   },
+  {
+    prop: 'customer_code',
+    label: '客户编码',
+    width: '150'
+  },
+  {
+    prop: 'customerName',
+    label: '客户名称',
+    width: '160'
+  },
   {
     prop: 'good_code',
     label: '商品成本编码',

+ 22 - 0
src/views/sellOut/sellReturn/index.vue

@@ -113,6 +113,18 @@
             </el-row>
 
             <el-row style="margin-top:10px">
+              <el-col :span="6" style="margin-right:10px">
+                <search-customer
+                  :value="parmValue.customer_code"
+                  :size="'mini'"
+                  :names="companyName"
+                  :placeholder="'企业客户'"
+                  :disabled="false"
+                  :is-detail="true"
+                  @searchChange="customer_code_change"
+                />
+              </el-col>
+
               <el-col :span="6" style="width: 400px;">
                   <el-input
                     clearable
@@ -254,6 +266,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        customer_code:[],
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
         company_name: "",
@@ -317,6 +330,14 @@ export default {
   },
 
   methods: {
+    customer_code_change(e) {
+      if (e && e.code) {
+        this.parmValue.customer_code = [e.code];
+      } else {
+        this.parmValue.customer_code = [];
+      }
+      this.searchList();
+    },
     handleExport(){
       if(this.select_list.length === 0){
         this.$message.warning('请选择一条退货单');
@@ -479,6 +500,7 @@ export default {
 
       const res = await asyncRequest.list({
         ...model,
+        customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
         needRela: true
       });
 

+ 1 - 1
src/views/serviceParam/orderuse/addEdit.vue

@@ -48,7 +48,7 @@
           <el-button
             v-if="id !== '007'"
             type="primary"
-            @click="submitForm"
+            @click="ç"
           >保 存
           </el-button>
           <el-button @click="showModelThis = false">{{

+ 2 - 2
src/views/serviceParam/platformGrossProfit/index.vue

@@ -193,7 +193,7 @@
           <i class="el-icon-edit tb-icon" @click="setRate(scope.row)"></i>
         </el-tooltip>
 
-        <el-tooltip
+        <!-- <el-tooltip
           v-if="powers.some((i) => i == '004') && scope.row.status + '' === '1'"
           effect="dark"
           content="禁用"
@@ -215,7 +215,7 @@
             class="el-icon-video-play tb-icon"
             @click="changeStatus(scope.row.cat_id, scope.row.status)"
           ></i>
-        </el-tooltip>
+        </el-tooltip> -->
 
         <el-tooltip
           v-if="parseInt(scope.row.level) < 3"

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio