chenrui 6 mesi fa
parent
commit
6be08c1a4b

+ 6 - 2
src/views/common/shopingCatModal.vue

@@ -11,7 +11,7 @@
     <div slot="title">
       <strong>{{ title }}</strong>
       <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-if="purchaseTargetType&&(purchaseTargetType=='DEALER_UP'||purchaseTargetType=='DEALER_SUPPLIER')">注意:仅可添加本供应商有权限的产品</span>
-      <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-else-if="purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'">注意:仅可添加本供应商有经销权且总部已上线的非轮胎产品</span>
+      <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-else-if="purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'">注意:仅可添加本供应商有经销权且总部已上线的{{ isSystemFlag==1?'非轮胎':'' }}产品</span>
     </div>
     <shopingCat ref="shopingCat" :purchaseType="purchaseTargetType" modes="modals" @ok="handleok"></shopingCat>
   </a-drawer>
@@ -42,7 +42,11 @@ export default {
     paramsData: {
       type: Object
     },
-    purchaseTargetType: {
+    purchaseTargetType: {// 提示语显示
+      type: String,
+      default: null
+    },
+    isSystemFlag: {// 是否是转单产品
       type: String,
       default: null
     }

+ 14 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -219,7 +219,7 @@
                   </a-col>
                   <a-col :span="6">
                     <div style="float:right;overflow: hidden;">
-                      <a-button v-if="!isDealerUp&&detail&&detail.orderType==='OTHER'" type="primary" class="button-primary" id="purchaseOrderEdit-cp-importQh-btn" @click="handleOutStock">导入缺货</a-button>
+                      <a-button v-if="(systemFlag==0&&!isDealerUp)||(systemFlag==1&&!isDealerUp&&detail&&detail.orderType==='OTHER')" type="primary" class="button-primary" id="purchaseOrderEdit-cp-importQh-btn" @click="handleOutStock">导入缺货</a-button>
                       <a-button id="purchaseOrderEdit-cp-importCp-btn" @click="openGuideModal=true">导入产品</a-button>
                     </div>
                   </a-col>
@@ -284,6 +284,7 @@
       :purchaseTargetType="detail?detail.purchaseTargetType:null"
       :paramsSn="$route.params.sn"
       :openModal="openOutStockModal"
+      :isSystemFlag="systemFlag"
       :chooseData="chooseData"
       @close="openOutStockModal=false"
       @ok="hanldeOkOutStock" />
@@ -311,6 +312,7 @@ import ProductBrand from '../../common/productBrand.js'
 import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
 import { purchaseDetailList, purchaseDetailSave, purchaseDetailDel } from '@/api/purchaseDetail'
 import { productListPurchase } from '@/api/product'
+import { getParamValue } from '@/api/data'
 
 export default {
   name: 'PurchaseEdit',
@@ -384,7 +386,8 @@ export default {
       openGuideModal: false, //  导入产品引导
       openOutStockModal: false, // 上次缺货弹框
       openAddrModal: false, // 选择地址弹框是否显示
-      openOutStockListModal: false // 导入缺货弹框
+      openOutStockListModal: false, // 导入缺货弹框
+      systemFlag: null// 是否是转单产品
     }
   },
   computed: {
@@ -679,6 +682,14 @@ export default {
         _this.spinning = false
       })
     },
+    // 获取系统参数  判断是否显示产品类型
+    getSystemInfo () {
+      getParamValue({ code: 'TIRE_OPEN' }).then(res => {
+        if (res.status == 200) {
+          this.systemFlag = res.data
+        }
+      })
+    },
     //  返回列表
     handleBack () {
       this.$router.push({ path: '/purchasingManagement/purchaseOrder/list' })
@@ -691,6 +702,7 @@ export default {
         this.resetSearchForm()
         this.$refs.searchProductCode.focus()
       })
+      this.getSystemInfo()
     }
   },
   mounted () {

+ 5 - 1
src/views/purchasingManagement/purchaseOrder/outStockModal.vue

@@ -10,7 +10,7 @@
     <div slot="title">
       <strong>采购缺货产品明细</strong>
       <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-if="purchaseTargetType&&(purchaseTargetType=='DEALER_UP'||purchaseTargetType=='DEALER_SUPPLIER')">注意:仅可添加本供应商有权限的产品</span>
-      <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-else-if="purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'">注意:仅可添加本供应商有经销权且总部已上线的非轮胎产品</span>
+      <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-else-if="purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'">注意:仅可添加本供应商有经销权且总部已上线的{{ isSystemFlag==1?'非轮胎':'' }}产品</span>
     </div>
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="outStock-con">
@@ -123,6 +123,10 @@ export default {
     purchaseTargetType: { // 采购类型
       type: String,
       default: null
+    },
+    isSystemFlag: {// 是否是转单产品
+      type: String,
+      default: null
     }
   },
   data () {

+ 21 - 3
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -24,7 +24,7 @@
               <a-menu-item key="3" v-if="$hasPermissions('M_shoppingCart')" id="purchaseNewOrderEdit-more-3">
                 <a-icon type="shopping" /> 购物车
               </a-menu-item>
-              <a-menu-item key="2" v-if="!isDealerUp&&detail&&detail.orderType==='OTHER'" id="purchaseNewOrderEdit-more-2">
+              <a-menu-item key="2" v-if="(systemFlag==0&&!isDealerUp)||(systemFlag==1&&!isDealerUp&&detail&&detail.orderType==='OTHER')" id="purchaseNewOrderEdit-more-2">
                 <a-icon type="funnel-plot" />导入缺货
               </a-menu-item>
               <a-menu-item key="1" id="purchaseNewOrderEdit-more-1">
@@ -170,12 +170,19 @@
       ref="outStock"
       :paramsSn="$route.params.sn"
       :chooseData="chooseData"
+      :isSystemFlag="systemFlag"
       :openModal="openOutStockModal"
       :purchaseTargetType="detail?detail.purchaseTargetType:null"
       @close="openOutStockModal=false"
       @ok="hanldeOkOutStock" />
     <!-- 购物车 -->
-    <shopingCatModal :showModal="openShopCatModal" :paramsData="paramsData" :purchaseTargetType="detail?detail.purchaseTargetType:null" @close="openShopCatModal=false" @ok="getOrderDetail(false, true)"></shopingCatModal>
+    <shopingCatModal
+      :showModal="openShopCatModal"
+      :isSystemFlag="systemFlag"
+      :paramsData="paramsData"
+      :purchaseTargetType="detail?detail.purchaseTargetType:null"
+      @close="openShopCatModal=false"
+      @ok="getOrderDetail(false, true)"></shopingCatModal>
   </div>
 </template>
 
@@ -190,6 +197,7 @@ import chooseAddressModal from '@/views/common/receivingAddress/chooseAddressMod
 // 接口
 import { purchaseDetailBySn, purchaseWriteSubmit, purchaseDetailPrint, purchaseDetailExport, purchaseDetailAddress } from '@/api/purchase'
 import { purchaseDetailList, purchaseDetailSave, purchaseDetailDel } from '@/api/purchaseDetail'
+import { getParamValue } from '@/api/data'
 // 选择产品
 import chooseProductModal from './chooseProductModal.vue'
 // 打印
@@ -272,7 +280,8 @@ export default {
       openOutStockModal: false, // 上次缺货弹框
       paramsData: null, // 传递购物车的参数
       openAddrModal: false, // 选择地址弹框是否显示
-      openOutStockListModal: false // 导入缺货
+      openOutStockListModal: false, // 导入缺货
+      systemFlag: null// 是否是转单产品
     }
   },
   computed: {
@@ -595,6 +604,14 @@ export default {
         _this.$refs.printBox.hovered = false
       })
     },
+    // 获取系统参数  判断是否显示产品类型
+    getSystemInfo () {
+      getParamValue({ code: 'TIRE_OPEN' }).then(res => {
+        if (res.status == 200) {
+          this.systemFlag = res.data
+        }
+      })
+    },
     //  返回列表
     handleBack () {
       this.$router.push({ name: 'purchaseOrderNewList' })
@@ -609,6 +626,7 @@ export default {
         this.setTableH()
         this.getOrderDetail(false, true)
       })
+      this.getSystemInfo()
     }
   },
   watch: {

+ 5 - 1
src/views/purchasingManagement/purchaseOrderNew/outStockModal.vue

@@ -12,7 +12,7 @@
     <div slot="title">
       <strong>采购缺货产品明细</strong>
       <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-if="purchaseTargetType&&(purchaseTargetType=='DEALER_UP'||purchaseTargetType=='DEALER_SUPPLIER')">注意:仅可添加本供应商有权限的产品</span>
-      <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-else-if="purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'">注意:仅可添加本供应商有经销权且总部已上线的非轮胎产品</span>
+      <span style="color: #ed1c24;;margin-left:10px;font-size: 12px;" v-else-if="purchaseTargetType&&purchaseTargetType=='SUPPLIER_SYS'">注意:仅可添加本供应商有经销权且总部已上线的{{ isSystemFlag==1?'非轮胎':'' }}产品</span>
     </div>
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="outStock-con jg-drawer-wrap">
@@ -127,6 +127,10 @@ export default {
     purchaseTargetType: {
       type: String,
       default: null
+    },
+    isSystemFlag: {// 是否是转单产品
+      type: String,
+      default: null
     }
   },
   data () {

+ 24 - 3
src/views/salesManagement/salesQuery/list.vue

@@ -218,7 +218,7 @@
             type="link"
             :id="'salesManagementList-edit-'+record.salesBillNo"
             class="button-primary"
-            v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING'||record.sourceType == 'XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT') && $hasPermissions('B_salesEdit')"
+            v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING'||record.sourceType == 'XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT'))||(systemFlag==1&&record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             编辑
@@ -249,7 +249,17 @@
             type="link"
             :id="'salesManagementList-cancel-'+record.salesBillNo"
             class="button-error"
-            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
+            v-if="systemFlag==1&&((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
+            @click="handleDel(record, 'cancel')"
+          >
+            取消
+          </a-button>
+          <a-button
+            size="small"
+            type="link"
+            :id="'salesManagementList-cancel-'+record.salesBillNo"
+            class="button-error"
+            v-if="systemFlag==0&&((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE'))&& $hasPermissions('B_salesDel')"
             @click="handleDel(record, 'cancel')"
           >
             取消
@@ -281,6 +291,7 @@ import custList from '@/views/common/custList.vue'
 import stateIcon from '@/views/common/stateIcon'
 // 接口
 import { salesList, salesDel, salesWriteAudit, salesWriteStockOut, salesCount, salesExport } from '@/api/sales'
+import { getParamValue } from '@/api/data'
 export default {
   name: 'SalesList',
   components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon },
@@ -356,7 +367,8 @@ export default {
       visibleAudit: false, // 审核弹框
       auditInfo: null, // 当前审核的数据
       spinningAudit: false, // 审核loading
-      distributionFlag: '0' //  是否铺货出库
+      distributionFlag: '0', //  是否铺货出库
+      systemFlag: null// 是否转单
     }
   },
   computed: {
@@ -532,6 +544,14 @@ export default {
         }
       }
     },
+    // 获取系统参数  判断是否显示产品类型
+    getSystemInfo () {
+      getParamValue({ code: 'TIRE_OPEN' }).then(res => {
+        if (res.status == 200) {
+          this.systemFlag = res.data
+        }
+      })
+    },
     // 重置
     resetSearchForm () {
       this.resetData()
@@ -607,6 +627,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
+      this.getSystemInfo()
       // 是否打开的页签
       const a = this.$store.state.app.isNewTab
       // 是否要刷新列表

+ 24 - 3
src/views/salesManagement/salesQueryNew/list.vue

@@ -223,7 +223,7 @@
               size="small"
               type="link"
               class="button-primary"
-              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING'||record.sourceType == 'XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT'))||(record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT') && $hasPermissions('B_salesEdit')"
+              v-if="(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING'||record.sourceType == 'XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT'))||(systemFlag==1&&record.sourceType === 'TRANSFER_ORDER'&&record.billStatus == 'WAIT_AUDIT')) && $hasPermissions('B_salesEdit')"
               @click="handleEdit(record)"
             >
               编辑
@@ -253,7 +253,17 @@
               size="small"
               type="link"
               class="button-error"
-              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
+              v-if="systemFlag==1&&((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && record.sourceType != 'TRANSFER_ORDER'&& $hasPermissions('B_salesDel')"
+              @click="handleDel(record, 'cancel')"
+            >
+              取消
+            </a-button>
+            <a-button
+              :id="'salesManagementList-cancel-'+record.id"
+              size="small"
+              type="link"
+              class="button-error"
+              v-if="systemFlag==0&&((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE'||record.sourceType =='XPRH_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE'))&& $hasPermissions('B_salesDel')"
               @click="handleDel(record, 'cancel')"
             >
               取消
@@ -284,6 +294,7 @@ import { downloadExcel } from '@/libs/JGPrint.js'
 import stateIcon from '@/views/common/stateIcon'
 // 接口
 import { salesList, salesDel, salesWriteAudit, salesWriteStockOut, salesCount, salesExport } from '@/api/sales'
+import { getParamValue } from '@/api/data'
 import moment from 'moment'
 export default {
   name: 'SalesList',
@@ -360,7 +371,8 @@ export default {
       visibleAudit: false, // 审核弹框
       auditInfo: null, // 审核信息
       spinningAudit: false, // 审核操作loading
-      distributionFlag: '0' // 是否铺货
+      distributionFlag: '0', // 是否铺货
+      systemFlag: null// 是否转单
     }
   },
   computed: {
@@ -541,6 +553,14 @@ export default {
         }
       }
     },
+    // 获取系统参数  判断是否显示产品类型
+    getSystemInfo () {
+      getParamValue({ code: 'TIRE_OPEN' }).then(res => {
+        if (res.status == 200) {
+          this.systemFlag = res.data
+        }
+      })
+    },
     // 重置
     resetSearchForm () {
       this.resetData()
@@ -615,6 +635,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
+      this.getSystemInfo()
       // 是否打开的页签
       const a = this.$store.state.app.isNewTab
       // 是否要刷新列表