Browse Source

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

chenrui 2 years ago
parent
commit
b80721147e

+ 1 - 1
public/version.json

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

+ 10 - 0
src/components/index.less

@@ -328,6 +328,16 @@
     box-shadow: 0 0 20px #dcdee2;
     box-shadow: 0 0 20px #dcdee2;
   }
   }
 }
 }
+// 确认框居中
+.confirm-center{
+  .ant-modal-confirm-body > .anticon + .ant-modal-confirm-title + .ant-modal-confirm-content{
+    margin-left:0;
+  }
+  .ant-modal-confirm-btns{
+    float: none;
+    text-align: center;
+  }
+}
 // 页签样式
 // 页签样式
 .multi-tab-con{
 .multi-tab-con{
   .ant-tabs-nav-container{
   .ant-tabs-nav-container{

+ 1 - 1
src/libs/tools.js

@@ -231,7 +231,7 @@ export const toThousands = (num, decimal) => {
     return '--'
     return '--'
   }
   }
   num = formatDecimal(num, decimal||decimal==0 ? decimal : 2)
   num = formatDecimal(num, decimal||decimal==0 ? decimal : 2)
-  return '¥' + num.toString().replace(/\d+/, function (n) { // 先提取整数部分
+  return (decimal!=0?'¥':'') + num.toString().replace(/\d+/, function (n) { // 先提取整数部分
     return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
     return n.replace(/(\d)(?=(\d{3})+$)/g, function ($1) {
       return $1 + ','
       return $1 + ','
     })
     })

+ 6 - 6
src/views/chainReportData/chainCallReport/detailList.vue

@@ -25,13 +25,13 @@
           </a-col>
           </a-col>
           <a-col :md="6" :sm="24">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁调出单号">
             <a-form-model-item label="连锁调出单号">
-              <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调单号"/>
+              <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调单号"/>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调对象">
-                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调对象">
+                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn" placeholder="请选择调往对象"></outTenant>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="4" :sm="24">
             <a-col :md="4" :sm="24">
@@ -91,7 +91,7 @@
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? toThousands(totalData.outCost) : '--' }}</strong>;
+          调总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? toThousands(totalData.outCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>
@@ -185,7 +185,7 @@ export default {
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },

+ 5 - 5
src/views/chainReportData/chainCallReport/list.vue

@@ -29,9 +29,9 @@
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调对象">
-                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调对象">
+                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn" placeholder="请选择调往对象"></outTenant>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
              <a-col :md="4" :sm="24">
              <a-col :md="4" :sm="24">
@@ -72,7 +72,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
+          调总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
         </div>
       </div>
       </div>
     </a-alert>
     </a-alert>
@@ -154,7 +154,7 @@ export default {
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库时间', dataIndex: 'outWarehouseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库时间', dataIndex: 'outWarehouseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/chainReportData/chainCallReport/outTenant.js

@@ -1,4 +1,4 @@
-import { getReportTenantList } from '@/api/allocLinkagePut'
+import { getReportTenantList } from '@/api/allocLinkageOut'
 // 调出对象
 // 调出对象
 const SettleStyle = {
 const SettleStyle = {
   template: `
   template: `

+ 12 - 12
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -28,18 +28,18 @@
               <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
               <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
-            <a-form-item label="调拨产品类型">
-              <v-select
-                v-model="queryParam.allocationType"
-                ref="allocationType"
-                id="chainTransferInReport-allocationType"
-                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                placeholder="请选择调拨产品类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="调拨产品类型">
+                <v-select
+                  v-model="queryParam.allocationType"
+                  ref="allocationType"
+                  id="chainTransferInReport-allocationType"
+                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                  placeholder="请选择调拨产品类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="4" :sm="24">
             <a-col :md="4" :sm="24">
               <a-form-model-item label="产品编码">
               <a-form-model-item label="产品编码">
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
                 <a-input id="chainTransferInReport-code" v-model.trim="queryParam.productEntity.code" allowClear placeholder="请输入产品编码"/>
@@ -61,7 +61,7 @@
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
           </template>
           </template>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainTransferInReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainTransferInReport-reset">重置</a-button>
             <a-button
             <a-button

+ 1 - 1
src/views/chainReportData/chainTransferReport/outTenant.js

@@ -1,4 +1,4 @@
-import { getReportTenantList } from '@/api/allocLinkageOut'
+import { getReportTenantList } from '@/api/allocLinkagePut'
 // 调出对象
 // 调出对象
 const SettleStyle = {
 const SettleStyle = {
   template: `
   template: `

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

@@ -80,7 +80,7 @@ const Warehouse = {
             }
             }
           })
           })
           this.warehouseCascadeData = res.data
           this.warehouseCascadeData = res.data
-          if(this.defaultVal.length==0){
+          if(this.defaultVal&&this.defaultVal.length==0){
             this.handleChange(_this.defaultWarehouseCascade)
             this.handleChange(_this.defaultWarehouseCascade)
           }
           }
         } else {
         } else {
@@ -89,7 +89,7 @@ const Warehouse = {
       })
       })
     },
     },
     setDefaultVal(){
     setDefaultVal(){
-      if(this.defaultVal.length==0){
+      if(this.defaultVal&&this.defaultVal.length==0){
         this.handleChange(this.defaultWarehouseCascade)
         this.handleChange(this.defaultWarehouseCascade)
       }
       }
     }
     }

+ 4 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -373,9 +373,10 @@ export default {
       const _this = this
       const _this = this
       this.$confirm({
       this.$confirm({
         title: '提示',
         title: '提示',
-        content: '确认收款吗?',
+        content: <div style="text-align:center"><p style="margin-top:20px;">收款单号:{row.settleNo} { row.bizName } 合计{ row.unsettleAmount }元</p><p>{row.settleClientName}</p><p>确认收款吗?</p></div>,
         centered: true,
         centered: true,
         closable: true,
         closable: true,
+        class:'confirm-center',
         onOk () {
         onOk () {
           _this.settleAcountPay(null, { type: 0, row: row })
           _this.settleAcountPay(null, { type: 0, row: row })
         }
         }
@@ -396,9 +397,10 @@ export default {
       const _this = this
       const _this = this
       this.$confirm({
       this.$confirm({
         title: '提示',
         title: '提示',
-        content: <div><p style="margin-top:20px;">合计金额¥{ this.selectTotalAmount } </p><p>确认批量收款吗?</p></div>,
+        content: <div style="text-align:center"><p style="margin-top:20px;">共计{this.rowSelectionInfo.selectedRowKeys.length}单,合计金额¥{ this.selectTotalAmount } </p><p>确认批量收款吗?</p></div>,
         centered: true,
         centered: true,
         closable: true,
         closable: true,
+        class:'confirm-center',
         onOk () {
         onOk () {
           _this.settleAcountPay(null, { type: 1, row: null })
           _this.settleAcountPay(null, { type: 1, row: null })
         }
         }

+ 6 - 5
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -12,13 +12,13 @@
       <!-- 合计 -->
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
         <div class="ftext" slot="message">
-          可用库存总数量(个):<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
+          可用库存总数量:<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-            可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? currentStock.currentStockCost : '--' }}</strong>;
+            可用库存总成本:<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? toThousands(currentStock.currentStockCost) : '--' }}</strong>;
           </div>
           </div>
-          冻结库存总数量(个):<strong>{{ currentStock&&(currentStock.freezeQty || currentStock.freezeQty==0) ? currentStock.freezeQty : '--' }}</strong>;
+          冻结库存总数量:<strong>{{ currentStock&&(currentStock.freezeQty || currentStock.freezeQty==0) ? currentStock.freezeQty : '--' }}</strong>;
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-            冻结库存总成本(¥):<strong>{{ currentStock&&(currentStock.freezeCost || currentStock.freezeCost==0) ? currentStock.freezeCost : '--' }}</strong>。
+            冻结库存总成本:<strong>{{ currentStock&&(currentStock.freezeCost || currentStock.freezeCost==0) ? toThousands(currentStock.freezeCost) : '--' }}</strong>。
           </div>
           </div>
         </div>
         </div>
       </a-alert>
       </a-alert>
@@ -66,6 +66,7 @@ export default {
       return '库存详情'
       return '库存详情'
     },
     },
     columns () {
     columns () {
+      const _this = this
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -80,7 +81,7 @@ export default {
         // { title: '成本单价', dataIndex: 'putCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '成本单价', dataIndex: 'putCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(10, 0, { title: '成本单价', dataIndex: 'putCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(10, 0, { title: '成本单价', dataIndex: 'putCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       }
       return arr
       return arr
     }
     }

+ 49 - 37
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -15,22 +15,27 @@
                 <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
                 <a-input id="inventoryQueryList-productOrigCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="产品名称">
+                <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品品牌">
+                <ProductBrand id="inventoryQueryList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productBrandSn"></ProductBrand>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="产品分类">
+                <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeType" v-model="productTypeSn"></ProductType>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="仓库仓位">
+                <Warehouse id="inventoryQueryList-warehouse" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="产品名称">
-                  <a-input id="inventoryQueryList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-model-item label="产品品牌">
-                  <ProductBrand id="inventoryQueryList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productBrandSn"></ProductBrand>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-model-item label="产品分类">
-                  <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeType" v-model="productTypeSn"></ProductType>
-                </a-form-model-item>
-              </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="滞销天数">
                 <a-form-model-item label="滞销天数">
                   <a-input-group>
                   <a-input-group>
@@ -60,7 +65,7 @@
                   </a-input-group>
                   </a-input-group>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="产品来源">
                 <a-form-item label="产品来源">
                   <a-select
                   <a-select
                     allowClear
                     allowClear
@@ -77,23 +82,25 @@
                 </a-form-item>
                 </a-form-item>
               </a-col>
               </a-col>
             </template>
             </template>
-            <a-col :md="10" :sm="24">
-              <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
-              <a-checkbox v-model="queryParam.enableFlag" :checked="queryParam.enableFlag" id="inventoryQueryList-enableFlag">包括禁用产品</a-checkbox>
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
-              <a-button
-                type="primary"
-                v-if="$hasPermissions('B_inventoryInventoryQueryExport')"
-                class="button-warning"
-                @click="handleExport"
-                :disabled="disabled"
-                :loading="exportLoading"
-                id="inventoryQueryList-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
+            <a-col :md="12" :sm="24">
+              <div style="margin-bottom: 10px;">
+                <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
+                <a-checkbox v-model="queryParam.enableFlag" :checked="queryParam.enableFlag" id="inventoryQueryList-enableFlag">包括禁用产品</a-checkbox>
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
+                <a-button
+                  type="primary"
+                  v-if="$hasPermissions('B_inventoryInventoryQueryExport')"
+                  class="button-warning"
+                  @click="handleExport"
+                  :disabled="disabled"
+                  :loading="exportLoading"
+                  id="inventoryQueryList-export">导出</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 5px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </div>
             </a-col>
             </a-col>
           </a-row>
           </a-row>
         </a-form>
         </a-form>
@@ -101,9 +108,9 @@
       <!-- 合计 -->
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
         <div class="ftext" slot="message">
-          可用库存总数量(个):<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}</strong>;
+          可用库存总数量:<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}</strong>;
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-            可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? currentStock.totalCurrentStockCost : '--' }}</strong>。
+            可用库存总成本:<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? toThousands(currentStock.totalCurrentStockCost) : '--' }}</strong>。
           </div>
           </div>
         </div>
         </div>
       </a-alert>
       </a-alert>
@@ -160,12 +167,13 @@ import { commonMixin } from '@/utils/mixin'
 import { stockList, stockCount, stockExport } from '@/api/stock'
 import { stockList, stockCount, stockExport } from '@/api/stock'
 import ProductType from '../../common/productType.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import ProductBrand from '../../common/productBrand.js'
+import Warehouse from '@/views/common/warehouse.js'
 import { STable, VSelect } from '@/components'
 import { STable, VSelect } from '@/components'
 import inventoryQueryDetailModal from './detailModal.vue'
 import inventoryQueryDetailModal from './detailModal.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { downloadExcel } from '@/libs/JGPrint.js'
 export default {
 export default {
   name: 'InventoryQueryList',
   name: 'InventoryQueryList',
-  components: { STable, VSelect, inventoryQueryDetailModal, ProductType, ProductBrand },
+  components: { STable, VSelect, inventoryQueryDetailModal, ProductType, ProductBrand, Warehouse },
   mixins: [commonMixin],
   mixins: [commonMixin],
   data () {
   data () {
     return {
     return {
@@ -180,6 +188,7 @@ export default {
         productTypeSn1: '', //  产品分类1
         productTypeSn1: '', //  产品分类1
         productTypeSn2: '', //  产品分类2
         productTypeSn2: '', //  产品分类2
         productTypeSn3: '', //  产品分类3
         productTypeSn3: '', //  产品分类3
+        warehouse: undefined,
         zeroQtyFlag: false, //  库存情况
         zeroQtyFlag: false, //  库存情况
         enableFlag: true, // 显示禁用产品
         enableFlag: true, // 显示禁用产品
         minUnsalableDays: undefined, // 滞销天数最小值
         minUnsalableDays: undefined, // 滞销天数最小值
@@ -253,6 +262,7 @@ export default {
   },
   },
   computed: {
   computed: {
     columns () {
     columns () {
+      const _this = this
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -266,7 +276,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(7, 0, { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '8%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       }
       return arr
       return arr
     }
     }
@@ -331,6 +341,8 @@ export default {
       this.queryParam.brandName = undefined
       this.queryParam.brandName = undefined
       this.queryParam.productTypeName = undefined
       this.queryParam.productTypeName = undefined
       this.queryParam.zeroQtyFlag = false
       this.queryParam.zeroQtyFlag = false
+      this.queryParam.warehouse = undefined
+      this.$refs.warehouse.setDefaultVal()
       this.productTypeSn = []
       this.productTypeSn = []
       this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
       this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
       this.queryParam.maxUnsalableDays = undefined // 滞销天数最大值
       this.queryParam.maxUnsalableDays = undefined // 滞销天数最大值

+ 7 - 6
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -83,13 +83,13 @@
         <!-- 合计 -->
         <!-- 合计 -->
         <a-alert type="info" style="margin-bottom:10px">
         <a-alert type="info" style="margin-bottom:10px">
           <div class="ftext" slot="message">
           <div class="ftext" slot="message">
-            当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}</strong>;
+            当前库存总数量:<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}</strong>;
             <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
             <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-              当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? productTotal.currentStockCost : '--' }}</strong>;
+              当前库存总成本:<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? toThousands(productTotal.currentStockCost) : '--' }}</strong>;
             </div>
             </div>
-            冻结库存总数量(个):<strong>{{ productTotal&&(productTotal.freezeQty || productTotal.freezeQty==0) ? productTotal.freezeQty : '--' }}</strong>;
+            冻结库存总数量:<strong>{{ productTotal&&(productTotal.freezeQty || productTotal.freezeQty==0) ? productTotal.freezeQty : '--' }}</strong>;
             <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
             <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-              冻结库存总成本(¥):<strong>{{ productTotal&&(productTotal.freezeCost || productTotal.freezeCost==0) ? productTotal.freezeCost : '--' }}</strong>。
+              冻结库存总成本:<strong>{{ productTotal&&(productTotal.freezeCost || productTotal.freezeCost==0) ? toThousands(productTotal.freezeCost) : '--' }}</strong>。
             </div>
             </div>
           </div>
           </div>
         </a-alert>
         </a-alert>
@@ -176,6 +176,7 @@ export default {
   },
   },
   computed: {
   computed: {
     columns () {
     columns () {
+      const _this = this
       const arr = [
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'product.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -190,11 +191,11 @@ export default {
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '9%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
         // { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '出入库状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '出入库状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(12, 0, { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(12, 0, { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       }
       return arr
       return arr
     }
     }

+ 3 - 1
src/views/productManagement/productInfoJg/list.vue

@@ -137,7 +137,8 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
         productTypeSn3: '', //  产品三级分类
-        onlineFalg: ''
+        onlineFalg: '',
+        enabledFlag: '1'
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
       exportLoading: false, // 导出loading
@@ -209,6 +210,7 @@ export default {
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.productTypeSn3 = ''
       this.queryParam.onlineFalg = ''
       this.queryParam.onlineFalg = ''
+      this.queryParam.enabledFlag = '1'
       this.productType = []
       this.productType = []
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)
       this.rowSelectionInfo = null
       this.rowSelectionInfo = null

+ 16 - 16
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -28,23 +28,23 @@
               <a-input id="urgentItemsOffsetReport-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
               <a-input id="urgentItemsOffsetReport-bizBillNo" v-model.trim="queryParam.bizBillNo" allowClear placeholder="请输入销售单号"/>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-model-item label="客户名称">
-              <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="急件类型">
-              <v-select
-                v-model="queryParam.bizType"
-                ref="status"
-                id="urgentItemsOffsetReport-biztype"
-                code="URGENT_BIZ_TYPE"
-                placeholder="急件类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
           <template v-if="advanced">
           <template v-if="advanced">
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="急件类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="status"
+                  id="urgentItemsOffsetReport-biztype"
+                  code="URGENT_BIZ_TYPE"
+                  placeholder="急件类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="产品编码">
               <a-form-model-item label="产品编码">
                 <a-input id="urgentItemsOffsetReport-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
                 <a-input id="urgentItemsOffsetReport-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>

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