Преглед на файлове

1、优化PDF查询条件

huangmp преди 2 години
родител
ревизия
64b3d3b642

+ 1 - 1
src/views/modules/order/orderInfo.vue

@@ -572,7 +572,7 @@
                     <div class="item">
                     <div class="item">
                       <div class="text">PDF文件:</div>
                       <div class="text">PDF文件:</div>
                       <el-link v-if="printOrder.printChannel === 'Lightning' && printOrder.pdfList.length > 0" type="primary" :underline="false" :href="resourcesUrl + printOrder.pdfList[0].pdfUrl" target="_blank">查看文件</el-link>
                       <el-link v-if="printOrder.printChannel === 'Lightning' && printOrder.pdfList.length > 0" type="primary" :underline="false" :href="resourcesUrl + printOrder.pdfList[0].pdfUrl" target="_blank">查看文件</el-link>
-                      <el-button :loading="generatePdfLoading" v-if="printOrder.printChannel === 'Lightning' && dataForm.status === 2" type="primary" size="mini" @click="generatePdf">生成PDF</el-button>
+                      <el-button :loading="generatePdfLoading" v-if="printOrder.printChannel === 'Lightning' && dataForm.status === 6" type="primary" size="mini" @click="generatePdf">生成PDF</el-button>
                     </div>
                     </div>
                   </el-col>
                   </el-col>
                   <el-col :span="12">
                   <el-col :span="12">

+ 1 - 0
src/views/modules/print/print-order.vue

@@ -135,6 +135,7 @@
               size="small"
               size="small"
               v-model="dateRange"
               v-model="dateRange"
               type="datetimerange"
               type="datetimerange"
+              :default-time="['00:00:00', '23:59:59']"
               :range-separator="this.$i18n.t('time.tip')"
               :range-separator="this.$i18n.t('time.tip')"
               value-format="yyyy-MM-dd HH:mm:ss"
               value-format="yyyy-MM-dd HH:mm:ss"
               :start-placeholder="this.$i18n.t('time.start')"
               :start-placeholder="this.$i18n.t('time.start')"

+ 8 - 2
src/views/modules/print/printList.vue

@@ -9,7 +9,12 @@
                   <el-form-item prop="pdfName" label="文件名:">
                   <el-form-item prop="pdfName" label="文件名:">
                     <el-input v-model="searchForm.pdfName" type="text" clearable placeholder="文件名"></el-input>
                     <el-input v-model="searchForm.pdfName" type="text" clearable placeholder="文件名"></el-input>
                   </el-form-item>
                   </el-form-item>
-                    <el-form-item label="生成时间:">
+                  <el-form-item prop="status" label="发货状态">
+                    <el-select v-model="searchForm.status" type="text" clearable placeholder="发货状态">
+                      <el-option key="2" label="未发货" value="2"></el-option>
+                    </el-select>
+                  </el-form-item>
+                    <el-form-item label="下单时间:">
                         <el-date-picker size="small" v-model="createDateRange" type="datetimerange"
                         <el-date-picker size="small" v-model="createDateRange" type="datetimerange"
                                         :default-time="['00:00:00', '23:59:59']"
                                         :default-time="['00:00:00', '23:59:59']"
                             range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
                             range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
@@ -100,6 +105,7 @@ export default {
                 startTime: undefined, // 起始时间
                 startTime: undefined, // 起始时间
                 endTime: undefined, // 结束时间,
                 endTime: undefined, // 结束时间,
                 pdfName: null,
                 pdfName: null,
+                status: null,
             },
             },
             levelTypes: [
             levelTypes: [
                 {
                 {
@@ -293,7 +299,7 @@ export default {
                 this.searchForm.startTime = this.createDateRange[0]
                 this.searchForm.startTime = this.createDateRange[0]
                 this.searchForm.endTime = this.createDateRange[1]
                 this.searchForm.endTime = this.createDateRange[1]
             }
             }
-            this.searchChange(true)
+            // this.searchChange(true)
         },
         },
         // 多选变化
         // 多选变化
         selectionChange(val) {
         selectionChange(val) {

+ 4 - 4
src/views/modules/resource/audio-store/audio-store.vue

@@ -182,7 +182,7 @@ export default {
       errShow: false,
       errShow: false,
       picNum: 0,
       picNum: 0,
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
       resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
-      type: 2,
+      type: 4,
       fileName: '',
       fileName: '',
       listType: 'picture',
       listType: 'picture',
       isLoading: true,
       isLoading: true,
@@ -258,7 +258,7 @@ export default {
           fileId: this.updateFileId,
           fileId: this.updateFileId,
           fileName: this.updateFileName,
           fileName: this.updateFileName,
           attachFileGroupId: this.selectGroup,
           attachFileGroupId: this.selectGroup,
-          type: 2
+          type: 4
         })
         })
       }).then(({ data }) => {
       }).then(({ data }) => {
         this.$message({
         this.$message({
@@ -481,7 +481,7 @@ export default {
       const method = 'put'
       const method = 'put'
       const param = {
       const param = {
         name: this.createGroupName,
         name: this.createGroupName,
-        type: 3 // 1、图片 2、视频 3、文件 4、音频
+        type: 4 // 1、图片 2、视频 3、文件 4、音频
       }
       }
       param.attachFileGroupId = this.updateGroupId
       param.attachFileGroupId = this.updateGroupId
       this.$http({
       this.$http({
@@ -508,7 +508,7 @@ export default {
         url: this.$http.adornUrl('/admin/fileGroup/list'),
         url: this.$http.adornUrl('/admin/fileGroup/list'),
         method: 'get',
         method: 'get',
         params: {
         params: {
-          type: 2 // 1、图片 2、视频 3、文件 4、音频
+          type: 4 // 1、图片 2、视频 3、文件 4、音频
         }
         }
       }).then(res => {
       }).then(res => {
         this.groupList = res.data
         this.groupList = res.data