Ver Fonte

bug 修复

lilei há 2 anos atrás
pai
commit
f99ef31d27

+ 3 - 0
src/views/allocationManagement/transferOut/dsModal.vue

@@ -49,6 +49,9 @@
               <a-radio value="UNABLE_PRINT">
                 暂不打印
               </a-radio>
+              <a-radio value="CANCEL_PRINT">
+                取消打印
+              </a-radio>
             </a-radio-group>
           </a-form-model-item>
         </a-form-model>

+ 2 - 1
src/views/allocationManagement/transfersPrint/list.vue

@@ -211,12 +211,13 @@ export default {
         { title: '调拨类型', dataIndex: 'allocateTypeName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印状态', dataIndex: 'printStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印次数', dataIndex: 'printCount', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(7, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(8, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         arr.splice(9, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
         arr.splice(10, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }

+ 19 - 3
src/views/salesManagement/receiptPrint/list.vue

@@ -40,7 +40,7 @@
                     <dealerSubareaScopeList ref="receiverName" id="salesCollectionList-receiverName" @change="receiverChange" />
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="业务状态">
                     <v-select
                       v-model="queryParam.billStatus"
@@ -51,7 +51,7 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24" v-if="currentTab == 1">
+                <a-col :md="6" :sm="24" v-if="currentTab == 1">
                   <a-form-item label="单据状态">
                     <v-select
                       v-model="queryParam.voidFlag"
@@ -62,7 +62,7 @@
                       allowClear></v-select>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24" v-if="currentTab == 1">
+                <a-col :md="6" :sm="24" v-if="currentTab == 1">
                   <a-form-item label="收款打印状态">
                     <v-select
                       v-model="queryParam.printState"
@@ -74,6 +74,11 @@
                     ></v-select>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="收款时间">
+                    <rangeDate ref="rangeSettleDate" :value="settleDate" @change="dateSettleChange" />
+                  </a-form-item>
+                </a-col>
                 <a-col :md="4" :sm="24">
                   <a-form-item label="所在区域">
                     <subarea id="salesCollectionList-subarea" v-model="queryParam.subareaSn"></subarea>
@@ -201,11 +206,14 @@ export default {
       bizSn: null,
       tableHeight: 0,
       time: [],
+      settleDate: [],
       currentTab: 2,
       // 查询参数
       queryParam: {
         beginDate: '',
         endDate: '',
+        beginDateSettle: '',
+        endDateSettle: '',
         bizNo: '',
         dispatchBillNo: '',
         settleClientName: '',
@@ -258,6 +266,7 @@ export default {
         // { title: '总售价', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款时间', dataIndex: 'settleTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款打印状态', dataIndex: 'printStateDictValue', width: '6%', align: 'center' },
         { title: '打印次数', dataIndex: 'printCount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
@@ -280,6 +289,11 @@ export default {
       this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
       this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
     },
+    //  收款时间  change
+    dateSettleChange (date) {
+      this.queryParam.beginDateSettle = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDateSettle = date[1] ? date[1] + ' 23:59:59' : ''
+    },
     custChange (val) {
       this.queryParam.settleClientName = val.name
     },
@@ -320,6 +334,8 @@ export default {
       if (this.advanced) {
         this.$refs.rangeDate.resetDate(this.time)
         this.$refs.receiverName.resetForm()
+        this.settleDate = []
+        this.$refs.rangeSettleDate.resetDate()
       }
       this.$refs.settleClientName.resetForm()
       this.queryParam = {

+ 1 - 0
src/views/salesManagement/stockPrint/list.vue

@@ -252,6 +252,7 @@ export default {
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据状态', dataIndex: 'voidFlagDictValue', width: '70px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
       ]