Kaynağa Gözat

fix:退货转单记录权限

snow 1 yıl önce
ebeveyn
işleme
dc2f66b641

+ 2 - 0
src/assets/js/btnList.js

@@ -96,6 +96,8 @@ const btnList = [
   { code: "095", name: "设置是否合规" },
   { code: '096',name: '设置平台' },
   { code: '097',name: '设置部门' },
+  { code: '098',name: '关联采购单' },
+  { code: '099',name: '解除关联' }
   // { code: '098',name: '采购单情况表' },
   // { code: '099',name: '竞价单反馈情况表' },
   // { code: '100',name: '当日库存销售情况表' },

+ 9 - 4
src/views/dataCorrection/managerBatchCorrection/components/template.js

@@ -1,14 +1,14 @@
 
 const mapTemplateToTable = {
   '销售订单编号': 'orderCode',
-  '业务经理': 'manager'
+  '业务经理ID': 'managerid',
+  '业务经理名称': 'manager'
 }
 
 export const getTableProperty = (key) => mapTemplateToTable[key]
-
 export const PROPERTYS = {
   ORDER_CODE: getTableProperty('销售订单编号'),
-  ORDER_CODE: getTableProperty('业务经理ID'),
+  MANAGER_ID: getTableProperty('业务经理ID'),
   MANAGER: getTableProperty('业务经理名称')
 }
 
@@ -28,9 +28,14 @@ export const columns = [
     label: '销售订单编号',
     required: true
   },
+  {
+    prop: PROPERTYS.MANAGER_ID,
+    label: '业务经理ID',
+    required: true
+  },
   {
     prop: PROPERTYS.MANAGER,
-    label: '业务经理',
+    label: '业务经理名称',
     required: true
   }
 ]

+ 3 - 3
src/views/sellOut/returnTransferStock/component/association-modal.vue

@@ -66,7 +66,7 @@ searchList();
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="供应商负责人" value="6"></el-option>
-                    <el-option label="采购供应商编号" value="7"></el-option>
+                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
                     <el-option label="订单编号" value="8"></el-option>
                   </el-select>
                 </el-input>
@@ -115,7 +115,7 @@ import { columns, statusOptions } from "./columns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 export default {
   mixins: [mixinPage, resToken],
-  props: ["showModel", "id"],
+  props: ["showModel", "id", "supplierNo"],
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"])
   },
@@ -283,7 +283,7 @@ export default {
       this.parmValue.good_code = this.select === "4" ? this.input : ""; // 产品属性编号
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 产品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
-      this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号
+      this.parmValue.supplierNo = this.supplierNo
       this.parmValue.orderCode = this.select === "8" ? this.input : ""; // 订单编号
 
       // this.wsm_supplierNo = [];

+ 8 - 3
src/views/sellOut/returnTransferStock/index.vue

@@ -126,12 +126,15 @@ searchList();
         </template>
         <template #operation="{ scope }">
           <el-button type="text" size="mini" @click="handleAssociation(scope)"
-            v-if="scope.row.status === '1' || scope.row.status === '3'">关联采购单</el-button>
-          <el-button type="text" size="mini" v-if="scope.row.status === '2'" @click="handleSecure(scope.row.id, scope.row.purcheaseOrder.cgdNo)">解除关联</el-button>
+            v-if="(scope.row.status === '1' || scope.row.status === '3') && powers.includes('098')">关联采购单</el-button>
+            
+            <el-button type="text" size="mini" 
+              v-if="scope.row.status === '2' && powers.includes('099')" 
+              @click="handleSecure(scope.row.id, scope.row.purcheaseOrder.cgdNo)">解除关联</el-button>
         </template>
       </ex-table>
 
-      <AssociationModal :id="recordId" :showModel="centerDialogVisible" @refresh="searchList"
+      <AssociationModal :id="recordId" :supplierNo="supplierNo" :showModel="centerDialogVisible" @refresh="searchList"
         @cancel="centerDialogVisible = false" />
     </div>
     <div v-else>
@@ -172,6 +175,7 @@ export default {
   },
   data() {
     return {
+      supplierNo:"",
       xs_order_type_options,
       xs_order_source_options,
       fileUrl: urlConfig.baseURL,
@@ -249,6 +253,7 @@ export default {
   methods: {
     handleAssociation(scope) {
       this.centerDialogVisible = true;
+      this.supplierNo = scope.row.supplierNo
       this.recordId = scope.row.id
     },
     companyNosearchChange({ code }) {