去掉返回

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

@@ -294,6 +294,10 @@ func (this *SelectController) GetProcessAuditList() {
 		datainfo.Items = list
 	} else if tabinx == "1" {
 		whereapp := "1=1"
+		//企业用户必须加创建人条件
+		if this.User.IsCompanyUser == 1 {
+			whereapp = whereapp + " and CreateUserId = '" + this.User.Id + "'"
+		}
 		if supplierTypeCode != "" {
 			whereapp = whereapp + " and AppendType like '%" + supplierTypeCode + "%'"
 		}
@@ -306,6 +310,10 @@ func (this *SelectController) GetProcessAuditList() {
 		datainfo.Items = list
 	} else if tabinx == "2" {
 		whereapp := "1=1"
+		//企业用户必须加创建人条件
+		if this.User.IsCompanyUser == 1 {
+			whereapp = whereapp + " and CreateUserId = '" + this.User.Id + "'"
+		}
 		if supplierTypeCode != "" {
 			whereapp = whereapp + " and SupplierTypeName like '%" + supplierTypeCode + "%'"
 		}
@@ -318,6 +326,10 @@ func (this *SelectController) GetProcessAuditList() {
 		datainfo.Items = list
 	} else if tabinx == "3" {
 		whereapp := "1=1"
+		//企业用户必须加创建人条件
+		if this.User.IsCompanyUser == 1 {
+			whereapp = whereapp + " and CreateUserId = '" + this.User.Id + "'"
+		}
 		if supplierName != "" {
 			whereapp = whereapp + " and SupplierName like '%" + supplierName + "%'"
 		}
@@ -327,6 +339,10 @@ func (this *SelectController) GetProcessAuditList() {
 		datainfo.Items = list
 	} else if tabinx == "4" {
 		whereapp := "1=1"
+		//企业用户必须加创建人条件
+		if this.User.IsCompanyUser == 1 {
+			whereapp = whereapp + " and CreateUserId = '" + this.User.Id + "'"
+		}
 		if supplierName != "" {
 			whereapp = whereapp + " and SupplierName like '%" + supplierName + "%'"
 		}

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

@@ -1335,6 +1335,12 @@ func (this *OilSupplierController) GetDictListByStatus() {
 	ids := orgsvc.GetAllChildUnitById("0")
 	svc.GetProOrTreeList(ids, &preorglist)
 	dictList["ProOrgList"] = preorglist
+
+	var unitorglist []organize.Base_Organize
+	where := "Category='Unit'"
+	orgsvc.GetEntities(&unitorglist, where)
+	dictList["UnitOrgList"] = preorglist
+
 	//获取我创建的所有公司
 	var list []supplier.OilSupplier
 	if this.User.IsCompanyUser == 1 {

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

@@ -12,7 +12,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"supplier_system/src/dashoo.cn/backend/api/business/msg"
 	"time"
 
 	"dashoo.cn/backend/api/business/auditsetting"
@@ -949,6 +948,13 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 	ActiComplete.CallbackUrl = ""
 	if dataother.SuccessStatus == 1 {
 		ActiComplete.Result = "1"
+
+
+		toMobile := supplierEntity.Mobile
+		msg:= supplierCertEntity.SupplierTypeName + "准入审批通过，请确认缴费信息！"
+		msgService := msg2.GetMsgService(utils.DBE)
+		msgService.HandleMsg(toMobile,msg,"1-1",supplierCertEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertEntity.CreateUserId))
+
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
@@ -981,9 +987,6 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 						"Step",
 					}
 					certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
-					msgService:=msg.GetMsgService(utils.DBE)
-					msg := "准入申请通过，请确认缴费信息"
-					msgService.HandleMsg(supplierEntity.Mobile,msg,"1-1","test",supplierEntity.ContactName,"1")
 				} else {
 					supplierCertEntity.Status = suppliercert.STOREING_STATUS
 					supplierCertEntity.Step = step
@@ -1316,19 +1319,19 @@ func (this *OilSupplierCertController) SendingSMS() {
 
 	for _,item := range list {
 		if currenttime.AddDate(0,3,0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
-			toMobile := item.Mobile
+			toMobile := "15288965998,15863081686,15563862958"//item.Mobile
 			msg:= "您的" + item.SupplierTypeName + "准入还有3个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
 			msgService.HandleMsg(toMobile,msg,"1-1",item.CreateBy,item.ContactName,strconv.Itoa(item.CreateUserId))
 		}
 		if currenttime.AddDate(0,2,0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
-			toMobile := item.Mobile
+			toMobile := "15288965998,15863081686,15563862958"//item.Mobile
 			msg:= "您的" + item.SupplierTypeName + "准入还有2个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
 			msgService.HandleMsg(toMobile,msg,"1-1",item.CreateBy,item.ContactName,strconv.Itoa(item.CreateUserId))
 		}
 		if currenttime.AddDate(0,1,0).Format("2006-01-02") == (item.ApplyTime.Format("2006-01-02")) {
-			toMobile := item.Mobile
+			toMobile := ",15863081686,15863081686,15563862958"//item.Mobile
 			msg:= "您的" + item.SupplierTypeName + "准入还有1个月到期"
 			msgService := msg2.GetMsgService(utils.DBE)
 			msgService.HandleMsg(toMobile,msg,"1-1",item.CreateBy,item.ContactName,strconv.Itoa(item.CreateUserId))

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue

@@ -9,7 +9,7 @@
         </el-button>
         <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
           v-if="canadd && IsCompanyUser == 1">
-          分办
+          提交
         </el-button>
       </div>
       <el-table :data="businessList" border bordertooltip-effect="dark"  @selection-change="handleSelectionChange">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -42,10 +42,10 @@
           </el-button>
           <el-button type="primary" @click="toWord" size="mini">表单下载</el-button>
           <el-button type="primary" @click="toPdf" size="mini">资质下载</el-button>
-          <router-link :to="'/oilsupplier/supplier/basislist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
-            </el-button>
-          </router-link>
+          <!--<router-link :to="'/oilsupplier/supplier/basislist'">-->
+            <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
+            <!--</el-button>-->
+          <!--</router-link>-->
         </span>
       </div>
 
@@ -280,7 +280,7 @@
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="分办" :visible.sync="dialogVisibleCom" width="520px">
+    <el-dialog title="提交" :visible.sync="dialogVisibleCom" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
           <el-col :span="24">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -48,9 +48,9 @@
           </el-button>
           <el-button type="primary" @click="toWord" size="mini">表单下载</el-button>
           <el-button type="primary" @click="toPdf" size="mini">资质下载</el-button>
-          <router-link :to="'/oilsupplier/supplier/goodslist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回</el-button>
-          </router-link>
+          <!--<router-link :to="'/oilsupplier/supplier/goodslist'">-->
+            <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回</el-button>-->
+          <!--</router-link>-->
         </span>
       </div>
 
@@ -286,7 +286,7 @@
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="分办" :visible.sync="dialogVisibleCom" width="520px">
+    <el-dialog title="提交" :visible.sync="dialogVisibleCom" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
           <el-col :span="24">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -43,10 +43,10 @@
           </el-button>
           <el-button type="primary" @click="toWord" size="mini">表单下载</el-button>
           <el-button type="primary" @click="toPdf" size="mini">资质下载</el-button>
-          <router-link :to="'/oilsupplier/supplier/techlist'">
-            <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
-            </el-button>
-          </router-link>
+          <!--<router-link :to="'/oilsupplier/supplier/techlist'">-->
+            <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
+            <!--</el-button>-->
+          <!--</router-link>-->
         </span>
       </div>
 
@@ -278,7 +278,7 @@
         <el-button size="mini" type="primary" @click="AuditEntity">确定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="分办" :visible.sync="dialogVisibleCom" width="520px">
+    <el-dialog title="提交" :visible.sync="dialogVisibleCom" width="520px">
       <el-form ref="searchForm" label-width="100px">
         <el-row>
           <el-col :span="24">

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

@@ -9,11 +9,11 @@
         <span>
           <i class="icon icon-table2"></i> 准入申请
         </span>
-        <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplier/add/goodsedit'">
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="canApply">准入申请</el-button>
-          </router-link>
-        </span>
+        <!--<span style="float: right;">-->
+          <!--<router-link :to="'/oilsupplier/supplier/add/goodsedit'">-->
+            <!--<el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" v-if="canApply">准入申请</el-button>-->
+          <!--</router-link>-->
+        <!--</span>-->
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -312,9 +312,16 @@
               </el-select>
             </el-form-item>
             <el-form-item label="专业处室">
-              <el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable
-                style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">
-              </el-cascader>
+              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
+                <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室">-->
+              <!--</el-cascader>-->
+              <el-select  v-model="formData.majorDept"
+                          placeholder="请选择" style="width: 100%">
+                {{orgtreelist}}
+                <el-option  v-for="item in orgtreelist" :key="item.Id" :label="item.Fullname"
+                            :value="item.Id">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -726,7 +733,7 @@
         }
         api.getDictListByStatus(params, this.$axios).then(res => {
           this.dictData = res.data.items
-          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          this.orgtreelist = res.data.items['UnitOrgList'] //window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
           // this.auditerOptions = res.data.items['Auditer']
           // this.organizeOption = res.data.items['Organizes']
         }).catch(err => {