瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
e25b52d2d0

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1660729509201
+  "version": 1660816234042
 }

+ 11 - 0
src/api/purchaseReturnApply.js

@@ -34,6 +34,17 @@ export const createPurchaseReturnBill = (params) => {
     method: 'post'
   })
 }
+// 选择产品列表
+export const queryDealerScopeProductPage = (params) => {
+  const url = `/purchaseReturnApply/queryDealerScopeProductPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
 //  采购退货 详情 添加产品
 export const purchaseReturnDetailSave = (params) => {
   return axios({

+ 4 - 4
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -227,7 +227,6 @@ import Print from '@/views/common/print.vue'
 import { hdPrint } from '@/libs/JGPrint'
 import ProductType from '../../common/productType.js'
 import importGuideModal from './importGuideModal.vue'
-import { productList } from '@/api/product'
 import {
   purchaseReturnDetailList,
   purchaseReturnDetail,
@@ -239,7 +238,8 @@ import {
   purchaseReturnSubmit,
   purchaseReturnApplyPrint,
   purchaseReturnApplyExport,
-  purchaseReturnApplyCreateList } from '@/api/purchaseReturnApply'
+  purchaseReturnApplyCreateList,
+  queryDealerScopeProductPage } from '@/api/purchaseReturnApply'
 export default {
   name: 'PurchaseReturnEdit',
   components: { STable, VSelect, Print, ProductType, importGuideModal },
@@ -264,7 +264,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.sysFlag = '1' // 剪冠产品
-        return productList(Object.assign(parameter, this.queryParam)).then(res => {
+        return queryDealerScopeProductPage(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -438,7 +438,7 @@ export default {
           fun(params).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
-              _this.$refs.table.refresh()
+              // _this.$refs.table.refresh()
               _this.$refs.chooseTable.refresh()
               _this.spinning = false
               _this.getDetail()

+ 2 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -57,7 +57,7 @@
         </a-form>
       </div>
       <!-- 操作按钮 -->
-      <div class="table-operator" v-if="$hasPermissions('B_purchaseReturnApplyNew')">
+      <div class="table-operator" v-if="!$hasPermissions('B_purchaseReturnApplyNew')">
         <a-button id="purchaseReturnList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
       </div>
       <!-- 列表 -->
@@ -85,7 +85,7 @@
               size="small"
               type="link"
               class="button-primary"
-              v-if="record.billStatus == 'WAIT_SUBMIT'&&$hasPermissions('B_purchaseReturnApplyEdit')"
+              v-if="record.billStatus == 'WAIT_SUBMIT'&&!$hasPermissions('B_purchaseReturnApplyEdit')"
               @click="handleEdit(record)"
             >编辑</a-button>
             <a-button

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.215:8076/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.215:8076/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,