页面调整

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -619,6 +619,7 @@ func (this *ActivitiService) FillWordWatermarkTemplate(datas map[string]interfac
 	sw = NewSeaweed("http", utils.Cfg.MustValue("file", "upFileHost"), filer, 2*1024*1024, 5*time.Minute)
 	//_, fID, err := sw.Upload(retVal.Body, "tmp.pdf", int64(len(pdfByte)), "", "")
 	_, _, fID, err := sw.UploadFile(_dir, "", "")
+	fmt.Println("err_表单下载=", err)
 	retDocUrl := utils.Cfg.MustValue("file", "downFileHost") + "/" + fID
 	os.Remove(_dir)
 	fmt.Println("==retDocWatermarkUrl==", retDocUrl)

src/dashoo.cn/backend/api/controllers/oilsupplier/select.go

@@ -1004,7 +1004,7 @@ func (this *SelectController) GetBusinessLicenseById() {
 	destZipName := SupplierName +  time.Now().Format("2006-01-02") + SupplierTypeCode
 	destZip := utils.Cfg.MustValue("file", "tmplateDir") + destZipName + ".zip"
 	err := Compress(files, destZip)
-
+	fmt.Println("err28==", err)
 	retDocUrl := ""
 	if err == nil {
 		var sw *Seaweed
@@ -1017,6 +1017,7 @@ func (this *SelectController) GetBusinessLicenseById() {
 		retDocUrl = utils.Cfg.MustValue("file", "downFileHost") + "/" + fID
 
 	}
+	fmt.Println("==retDocWatermarkUrlZZXZ==", retDocUrl)
 	err = os.RemoveAll(destZip)
 	fmt.Println(err)
 	err = os.RemoveAll(_dir)

src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -1215,7 +1215,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					paysvc.InsertEntity(&payinfo)
 					//发短信
 					toMobile := supplierEntity.Mobile
-					msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，`！"
+					msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认交费信息！"
 					msgService := msg2.GetMsgService(utils.DBE)
 					msgService.HandleMsg(toMobile, msg, "3-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/index.vue

@@ -38,7 +38,7 @@
             </el-dropdown>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7'">收入业务申请</el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="formData.CatalogType == '7'">申请</el-button>
             <el-button type="primary" size="mini" @click="addOilcatalog" v-if="showBtn">添加</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="exportExcel">导出</el-button>
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="importExcel" v-if="showBtn">导入</el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalogsub/index.vue

@@ -25,7 +25,7 @@
           </el-form-item>
           <el-form-item>
             <router-link :to="'/oilsupplier/oilcatalogsub/add/incomeedit'">
-              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">收入业务申请</el-button>
+              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加申请</el-button>
             </router-link>
           </el-form-item>
         </el-form>
@@ -76,7 +76,7 @@
             <span>{{ jstimehandle(scope.row.CreateOn+'') }}</span>
           </template>
         </el-table-column>
-        <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="SubmitOn" label="提交时候">
+        <el-table-column sortable width="100" align="center" show-overflow-tooltip prop="SubmitOn" label="提交时间">
           <template slot-scope="scope" >
             <span>{{ jstimehandle(scope.row.SubmitOn+'') }}</span>
           </template>