Kaynağa Gözat

Merge commit 'f6ad3a0a0aeac3dfe26ab888a2be75eab57c1af4' into HEAD

gitadmin 5 ay önce
ebeveyn
işleme
6694d6f156

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.50111",
+    "version": "2.2.514",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/libs/JGPrint.js

@@ -18,7 +18,7 @@ export const JGPrintTag = function (html, width, height, data) {
         if (agent.indexOf('win32') >= 0 || agent.indexOf('wow32') >= 0) {
           window.open('http://www.lodop.net/demolist/CLodop_Setup_for_Win32NT.zip')
         } else if (agent.indexOf('win64') >= 0 || agent.indexOf('wow64') >= 0) {
-          window.open('http://www.lodop.net/download/CLodop_Setup_for_Win64NT_4.155EN.zip')
+          window.open('https://www.lodop.net/download/CLodop_Setup_for_Win64NT_6.611EN.zip')
         }
       }
     })

+ 11 - 11
src/views/dowloadFile/list.vue

@@ -9,10 +9,9 @@
               <a-form-item label="创建时间">
                 <a-range-picker
                   id="dowloadFIle-beginDate"
-                  showTime
                   :disabled-date="disabledDate"
                   v-model="time"
-                  format="YYYY-MM-DD HH:mm:ss"
+                  format="YYYY-MM-DD"
                   @change="dateChange" />
               </a-form-item>
             </a-col>
@@ -70,18 +69,19 @@ export default {
   mixins: [commonMixin],
   components: { STable, VSelect },
   data () {
-    const startDate = moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD HH:mm:ss')
+    const startDate = getDate.getRecentday().starttime
+    const endDate = getDate.getRecentday().endtime
     return {
       spinning: false,
       tableHeight: 0,
       // 默认时间
       time: [
         startDate,
-        getDate.getRecentTime().endtime
+        endDate
       ],
       queryParam: { //  查询条件
         beginDate: startDate, // 开始时间
-        endDate: getDate.getRecentTime().endtime, // 结束时间
+        endDate: endDate, // 结束时间
         fileName: '', // 文件名称
         taskState: undefined // 状态
       },
@@ -123,7 +123,7 @@ export default {
   methods: {
     // 禁用时间
     disabledDate (current) {
-      return current && (current < moment(getDate.getRecentTime().starttime).subtract('days', 2) || current > moment().endOf('day'))
+      return current && (current < moment(getDate.getRecentday().starttime) || current > moment().endOf('day'))
     },
     // 下载文件
     dowloadExcel (url) {
@@ -131,8 +131,8 @@ export default {
     },
     //  时间  change
     dateChange (date, dateString) {
-      this.queryParam.beginDate = dateString[0] ? moment(dateString[0]).format('YYYY-MM-DD HH:mm:ss') : ''
-      this.queryParam.endDate = dateString[1] ? moment(dateString[1]).format('YYYY-MM-DD HH:mm:ss') : ''
+      this.queryParam.beginDate = dateString[0] ? moment(dateString[0]).format('YYYY-MM-DD 00:00:00') : ''
+      this.queryParam.endDate = dateString[1] ? moment(dateString[1]).format('YYYY-MM-DD 23:59:59') : ''
     },
     // 查询
     searchForm () {
@@ -140,9 +140,9 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.time = [moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD HH:mm:ss'), getDate.getRecentTime().endtime]
-      this.queryParam.beginDate = moment(getDate.getRecentTime().starttime).subtract('days', 1).format('YYYY-MM-DD HH:mm:ss')
-      this.queryParam.endDate = getDate.getRecentTime().endtime
+      this.time = [getDate.getRecentday().starttime, getDate.getRecentday().endtime]
+      this.queryParam.beginDate = getDate.getRecentday().starttime
+      this.queryParam.endDate = getDate.getRecentday().endtime
       this.queryParam.fileName = ''
       this.queryParam.type = undefined
       this.queryParam.taskState = undefined

+ 1 - 0
src/views/salesManagement/salesQueryNew/detail.vue

@@ -59,6 +59,7 @@
             <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="业务状态" v-if="detailData">{{ detailData.billStatusDictValue || '--' }}{{ (detailData.billStatus=='SUPERIOR_AUDIT_REJECT'||detailData.billStatus=='TRANSFER_AUDIT_REJECT')?'('+detailData.transferDealerName+')':'' }}</a-descriptions-item>
             <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="转单时间" v-if="detailData&&detailData.transferDate">{{ detailData.transferDate }}</a-descriptions-item>
             <a-descriptions-item label="改单时间" v-if="detailData&&detailData.salesBillSource=='PURCHASE'&&detailData.submitDate">{{ detailData.submitDate }}</a-descriptions-item>
             <a-descriptions-item label="最新提交时间" v-if="detailData&&detailData.salesBillSource=='SALES'&&detailData.submitDate">{{ detailData.submitDate }}</a-descriptions-item>
             <a-descriptions-item label="发货经销商" v-if="detailData&&detailData.billStatus&&(detailData.billStatus=='TRANSFER_YES'||detailData.billStatus=='TRANSFER_FINISH')">{{ detailData.transferDealerName || '--' }}</a-descriptions-item>

+ 14 - 0
src/views/salesManagement/salesQueryNew/list.vue

@@ -502,6 +502,18 @@ export default {
           value: 'totalConvertPromoGiftsAmount',
           key: 'totalConvertPromoGiftsAmount',
           disabled: !this.$hasPermissions('M_salesQueryList_salesPrice')
+        },
+        {
+          title: '发货经销商',
+          value: 'transferDealerName',
+          key: 'transferDealerName',
+          disabled: false
+        },
+        {
+          title: '转单时间',
+          value: 'transferDate',
+          key: 'transferDate',
+          disabled: false
         }
       ]
     }
@@ -514,6 +526,7 @@ export default {
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '8%', align: 'center' },
         { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '发货经销商', dataIndex: 'transferDealerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '7%', align: 'center', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
         { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -528,6 +541,7 @@ export default {
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '转单时间', dataIndex: 'transferDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 24 - 6
src/views/setting/dataValidManagement/list.vue

@@ -10,7 +10,7 @@
                 <rangeDate ref="rangeDate" id="erpMessageManagement-rangeDate" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="校验结果">
                 <a-select clearable placeholder="请选择校验结果" id="erpMessageManagement-checkResult" allowClear v-model="queryParam.resultType">
                   <a-select-option value="right" id="erpMessageManagement-checkResult-success">
@@ -22,17 +22,32 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="处理状态">
+                <a-select clearable placeholder="请选择处理状态" id="erpMessageManagement-disposeType" allowClear v-model="queryParam.disposeType">
+                  <a-select-option value="NO_DISPOSE" id="erpMessageManagement-disposeType-1">
+                    未处理
+                  </a-select-option>
+                  <a-select-option value="RUN_DISPOSE" id="erpMessageManagement-disposeType-2">
+                    处理中
+                  </a-select-option>
+                  <a-select-option value="YES_DISPOSE" id="erpMessageManagement-disposeType-3">
+                    已处理
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
               <a-form-item label="业务编号">
                 <a-input id="erpMessageManagement-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务编号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="业务名称">
                 <a-input id="erpMessageManagement-bizName" v-model.trim="queryParam.bizName" allowClear placeholder="请输入业务名称"/>
               </a-form-item>
             </a-col>
-            <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="$refs.table.refresh(true)" :disabled="disabled" id="erpMessageManagement-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="erpMessageManagement-reset">重置</a-button>
             </a-col>
@@ -120,12 +135,14 @@ export default {
         endDate: '', // 结束时间
         resultType: undefined, // 校验结果
         bizName: '', // 业务名称
-        bizNo: '' // 业务编号
+        bizNo: '', // 业务编号
+        disposeType: undefined // 处理状态
       },
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
         { title: '业务名称', dataIndex: 'bizName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '规则编号', dataIndex: 'checkItemId', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '校验内容', dataIndex: 'validContent', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务编号', dataIndex: 'bizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '校验结果', dataIndex: 'resultType', scopedSlots: { customRender: 'resultType' }, width: '6%', align: 'center' },
@@ -174,7 +191,8 @@ export default {
         endDate: '', // 结束时间
         resultType: undefined, // 校验结果
         bizName: '', // 业务名称
-        bizNo: '' // 业务编号
+        bizNo: '', // 业务编号
+        disposeType: undefined // 处理状态
       }
       this.$refs.rangeDate.resetDate()
       this.$refs.table.refresh(true)