lilei hace 2 años
padre
commit
ce8effad71

+ 1 - 1
public/version.json

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

+ 2 - 2
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -180,7 +180,7 @@
               </template>
               <!-- 退货金额合计 amount-->
               <template slot="amount" slot-scope="text, record">
-                {{ (record.cost * record.qty).toFixed(2) }}
+                {{ toThousands(record.cost * record.qty) }}
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -264,7 +264,7 @@ export default {
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货单价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'center' },
         { title: '退货数量', scopedSlots: { customRender: 'qty' }, width: '10%', align: 'center' },
-        { title: '退货金额', scopedSlots: { customRender: 'amount' }, width: '6%', align: 'center' },
+        { title: '退货金额', scopedSlots: { customRender: 'amount' }, width: '6%', align: 'right' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 2 - 2
src/views/salesManagement/productPricing/list.vue

@@ -33,7 +33,7 @@
             <a-col :md="6" :sm="24">
               <a-form-item label="产品状态">
                 <v-select
-                  code="ONLINE_FLAG"
+                  code="ONLINE_FLAG2"
                   id="productPricingList-onlineFalg"
                   v-model="queryParam.onlineFalg"
                   allowClear
@@ -43,7 +43,7 @@
             </a-col>
           </template>
           <a-col :md="8" :sm="24">
-            <a-checkbox v-model="queryParam.putStockFlag"><span style="display: inline-block;">显示未入库产品</span></a-checkbox>
+            <a-checkbox v-model="queryParam.putStockFlag"><span style="display: inline-block;">包含未入库产品</span></a-checkbox>
             <a-button style="margin-left: 10px" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productPricingList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productPricingList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">

+ 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.183:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.183:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,