修改月份排序问题

src/dashoo.cn/backend/api/business/oilsupplier/selectbusiness/selectservice.go

@@ -166,54 +166,7 @@ LEFT JOIN (SELECT  b.Month,a.CatalogSpe from (select extract(month from CreateOn
 			from OilCatalog
 			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=4 
 			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogSpe ON AnnualAudit.Month = CatalogSpe.Month ORDER BY AnnualAudit.Month)
-			union ALL
-			select '合计',sum(AnnualAudit),sum(Store),sum(Append),sum(InfoChange),sum(CatalogSelf),sum(CatalogWin),sum(CatalogTrade),sum(CatalogComp),sum(CatalogSpe) from (SELECT AnnualAudit.Month,AnnualAudit,Store,Append,InfoChange,CatalogSelf,CatalogWin,CatalogTrade,CatalogComp,CatalogSpe FROM(
-SELECT  b.Month,a.AnnualAudit from (select extract(month from ApplyTime) time ,COUNT(*) AnnualAudit
-			from OilAnnualAudit
-			WHERE ApplyTime >= '` + where +`' AND ApplyTime < '` + timedone +`' AND Status = '11'
-			group by extract(month from ApplyTime)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) AnnualAudit
-LEFT JOIN (SELECT  b.Month,a.Store from (select extract(month from ApplyTime) time ,COUNT(*) Store
-			from OilSupplierCert
-			WHERE ApplyTime >= '` + where +`' AND ApplyTime < '` + timedone +`' AND InFlag = '1'
-			group by extract(month from ApplyTime)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) Store ON AnnualAudit.Month = Store.Month
-LEFT JOIN (SELECT  b.Month,a.Append from (select extract(month from ApplyDate) time ,COUNT(*) Append
-			from OilSupplierCertAppend
-			WHERE ApplyDate >= '` + where +`' AND ApplyDate < '` + timedone +`' AND Status = '11'
-			group by extract(month from ApplyDate)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) Append ON AnnualAudit.Month = Append.Month
-LEFT JOIN (SELECT  b.Month,a.InfoChange from (select extract(month from CreateOn) time ,COUNT(*) InfoChange
-			from OilInfoChange
-			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND Status = '11'
-			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) InfoChange ON AnnualAudit.Month = InfoChange.Month
-LEFT JOIN (SELECT  b.Month,a.CatalogSelf from (select extract(month from CreateOn) time ,COUNT(*) CatalogSelf
-			from OilCatalog
-			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=1 
-			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogSelf ON AnnualAudit.Month = CatalogSelf.Month
-LEFT JOIN (SELECT  b.Month,a.CatalogWin from (select extract(month from CreateOn) time ,COUNT(*) CatalogWin
-			from OilCatalog
-			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=2 
-			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogWin ON AnnualAudit.Month = CatalogWin.Month
-LEFT JOIN (SELECT  b.Month,a.CatalogTrade from (select extract(month from CreateOn) time ,COUNT(*) CatalogTrade
-			from OilCatalog
-			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=3 
-			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogTrade ON AnnualAudit.Month = CatalogTrade.Month
-LEFT JOIN (SELECT  b.Month,a.CatalogComp from (select extract(month from CreateOn) time ,COUNT(*) CatalogComp
-			from OilCatalog
-			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=4 
-			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogComp ON AnnualAudit.Month = CatalogComp.Month
-LEFT JOIN (SELECT  b.Month,a.CatalogSpe from (select extract(month from CreateOn) time ,COUNT(*) CatalogSpe
-			from OilCatalog
-			WHERE CreateOn >= '` + where +`' AND CreateOn < '` + timedone +`' AND CatalogType=4 
-			group by extract(month from CreateOn)) a 
-			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogSpe ON AnnualAudit.Month = CatalogSpe.Month) countTotal`
+			RIGHT JOIN OilCountMonth b ON b.Month = a.time) CatalogSpe ON AnnualAudit.Month = CatalogSpe.Month ORDER BY AnnualAudit.Month) `
 
 	//if asc {
 	//	sql += ` order by ` + orderby + ` ASC `

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

@@ -30,8 +30,7 @@
         </el-form>
       </div>
       <!--内框表格显示-->
-      <el-table id="rebateSetTable" :data="entityList" size="mini" border height="calc(100vh - 230px)" style="width: 100%"
-        @sort-change="orderby" >
+      <el-table id="rebateSetTable" :data="entityList" size="mini" border show-summary  style="width: 100%" >
         <!--内框表格剩余栏显示-->
         <el-table-column label="日期" width="100px"  align="center" prop="Month" :formatter="formatUnit0"></el-table-column>
         <el-table-column label="准入管理">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -229,7 +229,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">

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

@@ -328,7 +328,7 @@
                       :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
           <el-input type="textarea"
                     v-model="shenheForm.AuditorRemark"
-                    placeholder="请输入审核说明"></el-input>
+                    placeholder="请输入审核意见"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer"