代码提交

src/api/sys/OSSService.js

@@ -60,8 +60,8 @@ export const client = new OSS({
   region: 'oss-cn-hangzhou', // oss地址
   accessKeyId: 'LTAI5tQDWoM9c1WyJNPs86rX', // 通过阿里云控制台创建的AccessKey ID。
   accessKeySecret: '84dDIx4edT1n78KUOqqSmDZ35pchJv', // 通过阿里云控制台创建的AccessKey Secret。
-  bucket: 'xgxm-test', // 仓库名字
-  // bucket: 'xg-pg', // 仓库名字
+  // bucket: 'xgxm-test', // 仓库名字
+  bucket: 'xg-pg', // 仓库名字
   useFetch: true, // 支持上传大于100KB的文件
   secure: false // 返回的url为https
 })
@@ -216,7 +216,7 @@ export async function openWindowOnUrl (row) {
   if (suffix === 'pdf') {
     window.open('https://view.xdocin.com/xdoc?_xdoc=' + encodeURIComponent(rowUrl), '_blank')
   } else if (suffix === 'rar' || suffix === 'zip' || suffix === 'jar' || suffix === '7z') {
-    window.open('http://ow365.cn/?i=30045&furl=' + encodeURIComponent(rowUrl), '_blank')
+    window.open('https://view.xdocin.com/xdoc?_xdoc=' + encodeURIComponent(rowUrl), '_blank')
   } else {
     window.open('https://view.officeapps.live.com/op/view.aspx?src=' + encodeURIComponent(rowUrl), '_blank')
   }

src/views/cw/invoice/InvoiceList.vue

@@ -209,7 +209,7 @@
                     filename: `兴光会计发票数据${moment(new Date()).format('YYYY-MM-DD')}`,
                     sheetName: `兴光会计发票数据${moment(new Date()).format('YYYY-MM-DD')}`,
                     exportMethod: exportMethod,
-                    types: ['xlsx'],
+                    types: ['xls'],
                     modes: ['current', 'selected', 'all']
                   }"
           :sort-config="{remote:true}"
@@ -842,7 +842,7 @@
         }
         return financeInvoiceService.exportFile(params).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(res, options.filename)
+          this.$utils.downloadExcel(res, options.filename+ ".xls")
         }).catch(function (err) {
           if (err.response) {
             console.log(err.response)

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -113,13 +113,13 @@
                       @getValue="(value) => {inputForm.officeId=value}"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <!--<el-col :span="12">
                   <el-form-item label="业务类型" prop="businessTypeName"
 								:rules="[
                                 {required: true, message:'业务类型不能为空', trigger:'blur'}]">
                     <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
                 <el-col :span="12">
                   <el-form-item label="风险等级" prop="riskLevel"
                                 :rules="[

src/views/finance/invoice/InvoiceList.vue

@@ -182,7 +182,7 @@
                     filename: `兴光评估发票数据${moment(new Date()).format('YYYY-MM-DD')}`,
                     sheetName: `兴光评估发票数据${moment(new Date()).format('YYYY-MM-DD')}`,
                     exportMethod: exportMethod,
-                    types: ['xlsx'],
+                    types: ['xls'],
                     modes: ['current', 'selected', 'all']
                   }"
           :sort-config="{remote:true}"
@@ -756,7 +756,7 @@
         }
         return this.financeInvoiceService.exportFile(params).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(res, options.filename)
+          this.$utils.downloadExcel(res, options.filename+ ".xls")
         }).catch(function (err) {
           if (err.response) {
             console.log(err.response)

src/views/flowable/task/HistoryList.vue

@@ -9,6 +9,13 @@
 			@keyup.enter="refreshList()"
 			@submit.prevent
 		>
+
+			<el-form-item label="实例标题" prop="title">
+				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="流程发起人" prop="assigneeId">
+				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value) => {searchForm.assigneeId = value}'></UserSelect2>
+			</el-form-item>
 			<el-form-item label="完成时间：" prop="searchDates">
 				<el-date-picker
 					v-model="searchDates"
@@ -19,12 +26,6 @@
 					end-placeholder="结束日期"
 				/>
 			</el-form-item>
-			<el-form-item label="实例标题" prop="title">
-				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
-			</el-form-item>
-			<el-form-item label="流程发起人" prop="assigneeId">
-				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value) => {searchForm.assigneeId = value}'></UserSelect2>
-			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
 					>查询</el-button

src/views/flowable/task/TodoList.vue

@@ -10,6 +10,13 @@
 			@keyup.enter.native="refreshList()"
 			@submit.native.prevent
 		>
+
+			<el-form-item label="实例标题" prop="title">
+				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="流程发起人" prop="assigneeId">
+				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value) => {searchForm.assigneeId = value}'></UserSelect2>
+			</el-form-item>
 			<el-form-item label="创建时间：" prop="searchDates">
 				<el-date-picker
 					v-model="searchDates"
@@ -20,12 +27,6 @@
 					end-placeholder="结束日期"
 				/>
 			</el-form-item>
-			<el-form-item label="实例标题" prop="title">
-				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
-			</el-form-item>
-			<el-form-item label="流程发起人" prop="assigneeId">
-				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value) => {searchForm.assigneeId = value}'></UserSelect2>
-			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
 					>查询</el-button