lilei пре 2 година
родитељ
комит
26a0719d70

+ 1 - 1
public/version.json

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

+ 1 - 1
src/components/tools/UserMenu.vue

@@ -19,7 +19,7 @@
       <!-- 通知 -->
       <!-- 通知 -->
       <notice-icon class="action"/>
       <notice-icon class="action"/>
       <!-- 皮肤设置 -->
       <!-- 皮肤设置 -->
-      <a-popover trigger="click" title="系统设置">
+      <a-popover title="系统设置">
         <div slot="content" :style="{width: fontSize == 'large' ? '340px' : '300px'}">
         <div slot="content" :style="{width: fontSize == 'large' ? '340px' : '300px'}">
           <a-form-model :label-col="{ span: 9 }" :wrapper-col="{ span: 15 }">
           <a-form-model :label-col="{ span: 9 }" :wrapper-col="{ span: 15 }">
             <a-form-model-item label="主题">
             <a-form-model-item label="主题">

+ 6 - 6
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -144,7 +144,7 @@ export default {
     },
     },
     width: {
     width: {
       type: [String, Number],
       type: [String, Number],
-      default: '70%'
+      default: '80%'
     },
     },
     zIndex: {
     zIndex: {
       type: Number,
       type: Number,
@@ -216,12 +216,12 @@ export default {
       return this.queryParam.code || this.queryParam.name || this.queryParam.productBrandSn || this.queryParam.productTypeSn1
       return this.queryParam.code || this.queryParam.name || this.queryParam.productBrandSn || this.queryParam.productTypeSn1
     },
     },
     tableWidth () {
     tableWidth () {
-      let w = 1260
+      let w = 1410
       if (this.isDealerUp) {
       if (this.isDealerUp) {
-        w = 1360
+        w = 1510
       }
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        w = this.isDealerUp ? 1360 : 1260
+        w = this.isDealerUp ? 1510 : 1410
       }
       }
       return w
       return w
     },
     },
@@ -230,7 +230,7 @@ export default {
       const arr = [
       const arr = [
         { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '150px', align: 'center', fixed: 'left' },
         { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '150px', align: 'center', fixed: 'left' },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '150px', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
         { title: '在途数', dataIndex: 'transitQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '在途数', dataIndex: 'transitQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '80px', align: 'center' },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '80px', align: 'center' },
@@ -246,7 +246,7 @@ export default {
         arr.splice(2, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } })
         arr.splice(2, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } })
       }
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(this.isDealerUp ? 3 : 2, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(this.isDealerUp ? 4 : 3, 0, { title: '成本价', dataIndex: 'purchasePrice', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       }
 
 
       return arr
       return arr

+ 1 - 3
src/views/salesManagement/salesQueryNew/edit.vue

@@ -784,9 +784,7 @@ export default {
             const priceType = vm.$route.params.priceType
             const priceType = vm.$route.params.priceType
             vm.$refs.partQuery.pageInit(buyerSn, priceType, vm.salesBillSn)
             vm.$refs.partQuery.pageInit(buyerSn, priceType, vm.salesBillSn)
             if(vm.detailData.totalCategory){
             if(vm.detailData.totalCategory){
-              vm.$nextTick(()=>{
-                vm.$refs.table.refresh(true)
-              })
+              vm.resetForm()
             }else{
             }else{
               vm.spinning = false
               vm.spinning = false
             }
             }

+ 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
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.0.103/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.0.103/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,
         changeOrigin: true,
         changeOrigin: true,