Browse Source

Merge branch 'deploy' of jianguan-web/qpls-md-html into master

陈瑞 4 years ago
parent
commit
0fb7480658

+ 20 - 0
src/libs/getDate.js

@@ -16,6 +16,16 @@ export default {
     obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
     return obj
   },
+  // 获取今日的开始结束时间  年月日时分秒
+  getTodayTime () {
+    const obj = {
+      starttime: '',
+      endtime: ''
+    }
+    obj.starttime = moment(moment().startOf('day').valueOf()).format('YYYY-MM-DD HH:mm:ss')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD HH:mm:ss')
+    return obj
+  },
   //  近7天
   getRecentday () {
     const obj = {
@@ -36,6 +46,16 @@ export default {
     obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD HH:mm:ss')
     return obj
   },
+  //  近3天
+  getThreeday () {
+    const obj = {
+      starttime: '',
+      endtime: ''
+    }
+    obj.starttime = moment().subtract('days', 2).format('YYYY-MM-DD')
+    obj.endtime = moment(moment().valueOf()).format('YYYY-MM-DD')
+    return obj
+  },
   // 获取昨日的开始结束时间
   getYesterday () {
     const obj = {

+ 1 - 1
src/views/inventoryManagement/warehouse/list.vue

@@ -35,7 +35,7 @@
         <!-- record.sysFlag表示该仓库是否默认,为默认仓库时则不可删除不可编辑 -->
         <a-button
           size="small"
-          v-if="$hasPermissions('M_inventory_warehouse_storingLocation')"
+          v-if="$hasPermissions('M_inventoryWarehouseStoringLocationList')"
           type="link"
           class="button-warning"
           @click="goStoringLocation(record)"

+ 3 - 3
src/views/salesManagement/salesQuery/list.vue

@@ -134,7 +134,7 @@
           size="small"
           type="link"
           class="button-info"
-          v-if="record.salesBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT')"
+          v-if="record.salesBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')"
           @click="handleEdit(record)"
         >
           编辑
@@ -166,7 +166,7 @@
         >
           取消
         </a-button>
-        <span v-if="record.billStatus == 'FINISH'||(record.salesBillSource == 'PURCHASE'&&record.billStatus == 'AUDIT_REJECT')">--</span>
+        <span v-if="record.billStatus == 'FINISH'">--</span>
       </template>
     </s-table>
     <!-- 选择客户弹框 -->
@@ -224,7 +224,7 @@ export default {
         { title: '收款方式', dataIndex: 'settleStyleEntity.name', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 100, align: 'center' },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
       ],

+ 3 - 3
src/views/salesManagement/salesReturn/queryPart.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
         <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
+          <a-col :md="6" :sm="24" v-if="grabFlag == 1">
             <a-form-item label="审核时间">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-item>
@@ -19,7 +19,7 @@
               <a-input id="productInfoList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
+          <template v-if="advanced && grabFlag == 1">
             <a-col :md="6" :sm="24">
               <a-form-item label="销售单号">
                 <a-input id="productInfoList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
@@ -29,7 +29,7 @@
           <a-col :md="6" :sm="24">
             <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin:0 15px 0 8px">
+            <a @click="advanced=!advanced" style="margin:0 15px 0 8px" v-if="grabFlag == 1">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>