Parcourir la source

Merge branch 'develop_12' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh12

chenrui il y a 2 ans
Parent
commit
b74d1af819

BIN
public/templ/库存预警产品导入模板.xlsx


+ 1 - 1
public/version.json

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

+ 5 - 5
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -13,7 +13,7 @@
         </template>
       </a-page-header>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="chainTransferOutEdit-cont">
+      <div class="chainTransferOutEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="选择产品">
             <!-- 筛选条件 -->
@@ -76,7 +76,7 @@
               @dblclick="handleClickRow"
               :data="loadData"
               :defaultLoadData="false"
-              :scroll="{ y: 300 }"
+              :scroll="{ y: 200 }"
               bordered>
               <!-- 调出数量 -->
               <template slot="outQty" slot-scope="text, record">
@@ -99,9 +99,9 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="chainTransferOutEdit-cont">
+      <div class="chainTransferOutEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
@@ -161,7 +161,7 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <div class="affix-cont">
       <a-button

+ 5 - 5
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -14,7 +14,7 @@
         </template>
       </a-page-header>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
+      <div class="storeTransferOutEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="选择产品">
             <!-- 筛选条件 -->
@@ -71,7 +71,7 @@
               :columns="columns"
               @dblclick="handleClickRow"
               :data="loadData"
-              :scroll="{ y: 300 }"
+              :scroll="{ y: 200 }"
               :defaultLoadData="false"
               bordered>
               <div slot="costTitle">
@@ -111,9 +111,9 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="storeTransferOutEdit-cont">
+      <div class="storeTransferOutEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
@@ -196,7 +196,7 @@
         </a-collapse>
         <!-- 出入库明细 -->
         <outInDetialModal ref="outInDetialModal" outBizType="SHOP_CALL_OUT" :openModal="showOutInModal" @close="showOutInModal=false"></outInDetialModal>
-      </a-card>
+      </div>
     </a-spin>
     <div class="affix-cont">
       <a-button

+ 5 - 5
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -10,7 +10,7 @@
         </template>
       </a-page-header>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
+      <div class="warehouseAllocationEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="选择产品">
             <!-- 筛选条件 -->
@@ -73,7 +73,7 @@
               @dblclick="handleClickRow"
               :data="loadData"
               :defaultLoadData="false"
-              :scroll="{ y: 300 }"
+              :scroll="{ y: 200 }"
               bordered>
               <!-- 产品分类 -->
               <template slot="productType" slot-scope="text, record">
@@ -109,9 +109,9 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="warehouseAllocationEdit-cont">
+      <div class="warehouseAllocationEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="已选产品">
             <!-- 总计 -->
@@ -201,7 +201,7 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <div class="affix-cont">
       <a-button

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -124,7 +124,7 @@ export default {
         { title: '采购单价', dataIndex: 'putCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '采购数量', dataIndex: 'putQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '采购金额', dataIndex: 'purchaseAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购金额', dataIndex: 'purchaseAmount', width: '7%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '仓库', dataIndex: 'warehouseName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],

+ 6 - 7
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -39,7 +39,7 @@
         </a-collapse>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <div class="bulkWarehousingOrderEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">
@@ -155,9 +155,9 @@
             </div>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="bulkWarehousingOrderEdit-cont">
+      <div class="bulkWarehousingOrderEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">
@@ -267,7 +267,7 @@
             </div>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <div class="affix-cont">
       <a-button
@@ -279,7 +279,6 @@
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
     </div>
-    <!-- 导入弹框 -->
     <!-- 导入费用明细 -->
     <importGuideModal
       :openModal="openGuideModal"
@@ -751,8 +750,8 @@ export default {
               item.warehouseLocationList.filter(subItem => {
                 if (subItem.defaultFlag == 1 && subItem.wasteFlag == 0) {
                   _this.defaultWarehouseCascade[1] = subItem.warehouseLocationSn
-                  _this.$refs.table.refresh(true)
-                  _this.$refs.chooseTable.refresh(true)
+                  // _this.$refs.table.refresh(true)
+                  // _this.$refs.chooseTable.refresh(true)
                 }
               })
             }

+ 0 - 1
src/views/common/supplier.js

@@ -18,7 +18,6 @@ const Employee = {
   props: {
     value: {
       type: String,
-      default: ''
     },
     id: {
       type: String,

+ 6 - 2
src/views/common/warehouse.js

@@ -37,6 +37,10 @@ const Warehouse = {
       type: Boolean,
       default: false
     },
+    showDefault:{
+      type: Boolean,
+      default: true
+    }
   },
   data () {
     return {
@@ -85,7 +89,7 @@ const Warehouse = {
             }
           })
           this.warehouseCascadeData = res.data
-          if(this.defaultVal&&this.defaultVal.length==0){
+          if(this.defaultVal&&this.defaultVal.length==0&&this.showDefault){
             this.handleChange(_this.defaultWarehouseCascade)
           }
         } else {
@@ -94,7 +98,7 @@ const Warehouse = {
       })
     },
     setDefaultVal(){
-      if(this.defaultVal&&this.defaultVal.length==0){
+      if(this.defaultVal&&this.defaultVal.length==0&&this.showDefault){
         this.handleChange(this.defaultWarehouseCascade)
       }
     }

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -374,7 +374,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>收款单号:{row.settleNo} 合计{ this.toThousands(row.unsettleAmount) }</p><p>确认收款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>收款单号:{row.settleNo}合计{ this.toThousands(row.unsettleAmount) }</p><p>确认收款吗?</p></div>,
         centered: true,
         closable: true,
         class: 'confirm-center',

+ 1 - 1
src/views/financialManagement/financialPayment/list.vue

@@ -377,7 +377,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>付款单号:{row.settleNo} 合计{ this.toThousands(row.unsettleAmount) }</p><p>确认付款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">{row.settleClientName}</p><p>付款单号:{row.settleNo}合计{ this.toThousands(row.unsettleAmount) }</p><p>确认付款吗?</p></div>,
         centered: true,
         closable: true,
         class: 'confirm-center',

+ 1 - 6
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -32,7 +32,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库仓位">
-                <Warehouse id="inventoryQueryList-warehouse" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
+                <Warehouse id="inventoryQueryList-warehouse" :showDefault="false" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -444,11 +444,6 @@ export default {
       })
       // 是否默认包括禁用产品
       this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
-      
-      this.$nextTick(() => {
-        this.queryParam.warehouse = []
-        this.$refs.warehouse.setDefaultVal()
-      })
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 12 - 1
src/views/inventoryManagement/inventoryWarning/chooseImportModal.vue

@@ -37,6 +37,16 @@
         :scroll="{ y: 200 }"
         :pagination="false"
         bordered>
+        <template slot="errorMsg" slot-scope="text,record">
+          <a-popover placement="topRight">
+            <template slot="content">
+              <p v-for="d in record.importErrorMsgSet" v-if="d">{{ d }};</p>
+            </template>
+            <a-button type="link">
+              查看
+            </a-button>
+          </a-popover>
+        </template>
       </a-table>
       <!-- 按钮 -->
       <div class="btn-con">
@@ -100,7 +110,7 @@ export default {
         { title: '在途数(个)', dataIndex: 'inTransit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最大库存数(个)', dataIndex: 'upperLimit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最小库存数(个)', dataIndex: 'lowerLimit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '错误原因', dataIndex: 'errorMsg', width: '17%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '错误原因', scopedSlots: { customRender: 'errorMsg' }, width: '10%', align: 'center' }
       ],
       loadData: [],
       unLoadData: [],
@@ -122,6 +132,7 @@ export default {
           if (res.data.errorList && res.data.errorList.length > 0) {
             res.data.errorList.map((item, index) => {
               item.no = index + 1
+              item.importErrorMsgSet = item.errorMsg ? item.errorMsg.split(';') : []
             })
           }
           _this.loadData = res.data.rightList || []

+ 5 - 3
src/views/inventoryManagement/inventoryWarning/importGuideModal.vue

@@ -16,8 +16,9 @@
           </div>
           <ul>
             <li>1)导入的Excel文件中必须包含名称为“产品编码”、"在途数(个)”、“最大库存数(个)”、“最小库存数(个)”的列,且名称必须相同,其他列可自定义,不影响数据导入</li>
+            <li><a-icon type="download" /><a :href="templUrl">下载导入模板</a></li>
           </ul>
-          <a-button type="link" icon="download" style="padding: 0 0 0 23px;" @click="handleExport">下载导入模板</a-button>
+          <!-- <a-button type="link" icon="download" style="padding: 0 0 0 23px;" @click="handleExport">下载导入模板</a-button> -->
         </div>
         <div class="explain-item">
           <div class="explain-tit">
@@ -84,7 +85,8 @@ export default {
       paramsData: null,
       uploadParams: {
         savePathType: 'local'
-      }
+      },
+      templUrl: location.host + '/templ/库存预警产品导入模板.xlsx'
     }
   },
   methods: {
@@ -120,7 +122,7 @@ export default {
     handleExport () {
       const link = document.createElement('a')
       link.style.display = 'none'
-      link.href = 'https://jianguan-images.oss-cn-beijing.aliyuncs.com/template/inventoryWarningProductImport.xlsx'
+      link.href = location.host + '/templ/库存预警产品导入模板.xlsx'
       link.setAttribute('download', '库存预警产品导入模板' + '.xlsx')
       document.body.appendChild(link)
       link.click()

+ 4 - 4
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -159,16 +159,16 @@ export default {
         { title: '调回单号', scopedSlots: { customRender: 'recallBillNo' }, width: '20%', align: 'center' },
         { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
-        { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],
       innerColumns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调回数量', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
-        { title: '实退数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
+        { title: '调回数量', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '实退数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '单位', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       innerData: [],

+ 3 - 3
src/views/numsGoodsShelves/recallStockManagement/editStock.vue

@@ -12,7 +12,7 @@
         <a-alert type="info" style="margin:10px 0">
           <div slot="message" >
             入库总数量<strong>{{ pageInfo &&pageInfo.productTotalQty?pageInfo.productTotalQty:'--' }}</strong>,
-            入库总成本¥<strong>{{ pageInfo &&pageInfo.productTotalCost?pageInfo.productTotalCost:0 }}</strong>
+            入库总成本<strong>{{ pageInfo &&pageInfo.productTotalCost? toThousands(pageInfo.productTotalCost):'--' }}</strong>
           </div>
         </a-alert>
         <s-table
@@ -88,11 +88,11 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '20%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '32%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'putQty', width: '7.5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库单价', scopedSlots: { customRender: 'putCost' }, width: '7.5%', align: 'center' },
-        { title: '入库成本', dataIndex: 'putTotalCost', width: '25%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '入库成本', dataIndex: 'putTotalCost', width: '12%', align: 'center', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],
       warehouseCascadeData: [], //  仓库仓位

+ 1 - 1
src/views/numsGoodsShelves/recallStockManagement/list.vue

@@ -103,7 +103,7 @@ export default {
         { title: '调回单号', dataIndex: 'putBizNo', width: '15%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '货架名称', dataIndex: 'providerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库总数量', dataIndex: 'productTotalQty', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '入库总成本', dataIndex: 'productTotalCost', width: '10%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        { title: '入库总成本', dataIndex: 'productTotalCost', width: '10%', align: 'center', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
         { title: '状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'auditTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'left' }

+ 6 - 6
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -49,7 +49,7 @@
         </a-collapse>
       </a-card>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
+      <div class="purchaseOrderEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">
@@ -164,9 +164,9 @@
             </div>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
+      <div class="purchaseOrderEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">已选产品</template>
@@ -205,8 +205,8 @@
                   </a-col>
                   <a-col :span="6">
                     <div style="float:right;overflow: hidden;">
-                      <a-button size="small" type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
-                      <a-button size="small" id="purchaseOrderEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+                      <a-button type="primary" class="button-primary" id="purchaseOrderEdit-import-btn" @click="handleOutStock">上次缺货</a-button>
+                      <a-button id="purchaseOrderEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
                     </div>
                   </a-col>
                 </a-row>
@@ -249,7 +249,7 @@
             </div>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <div class="affix-cont">
       <a-button

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

@@ -92,7 +92,7 @@
         </a-collapse>
       </div>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">
@@ -185,7 +185,7 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <a-card size="small" :bordered="false" class="affix-cont">
       <a-button

+ 3 - 5
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -13,8 +13,7 @@
         </template>
       </a-page-header>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
-        <div class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
           <a-collapse :activeKey="['1']">
             <a-collapse-panel key="1" header="选择产品">
               <!-- 筛选条件 -->
@@ -103,9 +102,8 @@
             </a-collapse-panel>
           </a-collapse>
         </div>
-      </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">
@@ -200,7 +198,7 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <a-card size="small" :bordered="false" class="affix-cont">
       <a-button

+ 5 - 7
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -13,8 +13,7 @@
         </template>
       </a-page-header>
       <!-- 选择产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
-        <div class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
           <a-collapse :activeKey="['1']">
             <a-collapse-panel key="1" header="选择产品">
               <!-- 筛选条件 -->
@@ -93,9 +92,8 @@
             </a-collapse-panel>
           </a-collapse>
         </div>
-      </a-card>
       <!-- 已选产品 -->
-      <a-card size="small" :bordered="false" class="purchaseReturnEdit-cont">
+      <div class="purchaseReturnEdit-cont">
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1">
             <template slot="header">
@@ -182,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">
@@ -191,7 +189,7 @@
             </s-table>
           </a-collapse-panel>
         </a-collapse>
-      </a-card>
+      </div>
     </a-spin>
     <a-card size="small" :bordered="false" class="affix-cont">
       <a-button
@@ -266,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">

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -205,7 +205,7 @@ export default {
         { title: '单位', dataIndex: 'productOrigUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价小计', dataIndex: 'totalAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折后小计', dataIndex: 'discountedAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '折扣金额', dataIndex: 'discountAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '折扣金额', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         // { title: '仓库', dataIndex: 'warehouseName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '仓位', dataIndex: 'warehouseLocationName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否急件', dataIndex: 'oosFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },