lilei 2 年 前
コミット
71207a386b

+ 2 - 2
src/views/allocationManagement/transferOut/printModal.vue

@@ -31,8 +31,8 @@
         </a-form-model-item>
         <a-form-model-item label="产品价格" prop="priceType" v-if="nowType=='dbPrint'">
           <a-radio-group v-model="form.priceType">
-            <a-radio value="ALLOCATE_BILL_PRICE">销售价</a-radio>
-            <a-radio value="ALLOCATE_BILL_COST">成本价</a-radio>
+            <a-radio value="ALLOCATE_BILL_PRICE" v-if="$hasPermissions('B_isShowPrice')">销售价</a-radio>
+            <a-radio value="ALLOCATE_BILL_COST" v-if="$hasPermissions('B_isShowCost')">成本价</a-radio>
             <a-radio value="ALLOCATE_BILL">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>

+ 2 - 0
src/views/productManagement/newProduct/list.vue

@@ -173,6 +173,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate()
+      this.queryParam.beginDate = ''
+      this.queryParam.endDate = ''
       this.queryParam.code = ''
       this.queryParam.name = ''
       this.queryParam.origCode = ''

+ 19 - 1
src/views/productManagement/productInfo/list.vue

@@ -57,6 +57,11 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="最近修改时间">
+                  <rangeDate ref="rangeDate" @change="dateChange" />
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
@@ -211,17 +216,20 @@ import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQueryAll } from '@/api/productType'
 import ProductBrand from '@/views/common/productBrand.js'
 import { exportExcel } from '@/libs/JGPrint.js'
+import rangeDate from '@/views/common/rangeDate.vue'
 import { productList, productAudit, productBatchAudit, productDel, productOnline, productBatchOnline, productExport } from '@/api/product'
 export default {
   name: 'ProductInfoList',
   mixins: [commonMixin],
-  components: { STable, VSelect, productInfoDetailModal, productInfoOfflineModal, ProductBrand },
+  components: { STable, VSelect, productInfoDetailModal, productInfoOfflineModal, ProductBrand, rangeDate },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
+        updateBeginDate: '',
+        updateEndDate: '',
         name: '', //  产品名称
         queryWord: '', // 产品编码/原厂编码
         productBrandSn: undefined, //  产品品牌
@@ -288,6 +296,11 @@ export default {
     }
   },
   methods: {
+    //  创建时间  change
+    dateChange (date) {
+      this.queryParam.updateBeginDate = date[0] || ''
+      this.queryParam.updateEndDate = date[1] || ''
+    },
     // 表格选中项
     rowSelectionFun (obj) {
       this.rowSelectionInfo = obj || null
@@ -438,6 +451,11 @@ export default {
       this.queryParam.pricingState = undefined
       this.queryParam.picFlag = undefined
       this.productType = []
+      if (this.advanced) {
+        this.$refs.rangeDate.resetDate()
+        this.queryParam.updateBeginDate = ''
+        this.queryParam.updateEndDate = ''
+      }
       this.$refs.table.refresh(true)
     },
     //  新增/编辑

+ 5 - 1
src/views/productManagement/productPricing/list.vue

@@ -78,7 +78,7 @@
           @click="handleBatchAudit"
           v-if="$hasPermissions('B_productPricing_audit')"
           style="margin: 0 15px 0 0;">批量审核</a-button>
-        <span v-if="$hasPermissions('B_productPricing_audit')">已选{{ rowSelectionInfo&&rowSelectionInfo.selectedRowKeys?rowSelectionInfo.selectedRowKeys.length:0 }}项</span>
+        <span v-if="$hasPermissions('B_productPricing_audit')&&selTotal">已选{{ selTotal }}项</span>
       </div>
       <!-- 列表 -->
       <s-table
@@ -199,6 +199,9 @@ export default {
     }
   },
   computed: {
+    selTotal () {
+      return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys ? this.rowSelectionInfo.selectedRowKeys.length : 0
+    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '3%', align: 'center' },
@@ -261,6 +264,7 @@ export default {
       this.queryParam.productTypeSn3 = ''
       this.queryParam.pricingState = undefined
       this.productType = []
+      this.$refs.table.clearSelected() // 清空表格选中项
       this.$refs.table.refresh(true)
     },
     // 审核