分办提交年审-

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochangeService.go

@@ -38,7 +38,7 @@ func (s *InfoChangeService) GetInfoforItem(supname, item, where string) string {
 func (s *InfoChangeService) GetSupplierList(supname,where string) []annualaudit.Suppliername {
 	var sql string
 	//sql = `select * from  `+ supname +` where Id not in ( select SupplierId  from `+ auditname +` where  YEAR(CreateOn)=YEAR(NOW()))`
-	sql = `select * from  `+ supname + ` a left join OilSupplierCert b on a.Id = b.SupplierId  where ` + where
+	sql = `select a.Id, a.SupplierName from  `+ supname + ` a left join OilSupplierCert b on a.Id = b.SupplierId  where ` + where
 	List := make([]annualaudit.Suppliername, 0)
 	utils.DBE.Sql(sql).Find(&List)
 	return List

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

@@ -219,15 +219,16 @@ func (this *AnnualAuditController) GetSupplierList() {
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
 		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
-	} else {
-		//超级管理员和有查看所有数据权限的用户不加条件
-		svcPerm := permission.GetPermissionService(utils.DBE)
-		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
-		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
-		}
 	}
-	where = where + " and b.SupplierTypeCode='" + code + "' and b.Status='8'"
+	//else {
+	//	//超级管理员和有查看所有数据权限的用户不加条件
+	//	svcPerm := permission.GetPermissionService(utils.DBE)
+	//	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+	//	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+	//		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+	//	}
+	//}
+	where = where + " and b.SupplierTypeCode='" + code + "' and b.Status='" + suppliercert.STORE_STATUS+"'"
 	supplierlist = svc.GetSupplierList(""+OilSupplierName, where)
 	var datainfo DataInfo
 	datainfo.Items = supplierlist

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

@@ -903,15 +903,19 @@ func (this *InfoChangeController) GetAddSupplierList() {
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
 		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
-	} else {
-		//超级管理员和有查看所有数据权限的用户不加条件
-		svcPerm := permission.GetPermissionService(utils.DBE)
-		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
-		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-			where = where + " and a.CreateUserId = '" + this.User.Id + "'"
-		}
 	}
-	supplierlist = svc.GetSupplierList(""+OilSupplierName, where)
+	//else {  // 二级单位可以为所有企业提交信息变更 2020-03-12
+	//	//超级管理员和有查看所有数据权限的用户不加条件
+	//	svcPerm := permission.GetPermissionService(utils.DBE)
+	//	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
+	//	if !svcPerm.IsAdmin(this.User.Id) && !isauth {
+	//		where = where + " and a.CreateUserId = '" + this.User.Id + "'"
+	//	}
+	//}
+	//supplierlist = svc.GetSupplierList(""+OilSupplierName, where)
+
+	svc.GetEntitysByWhere(OilSupplierName, where, &supplierlist)
+
 	var datainfo DataInfo
 	datainfo.Items = supplierlist
 	this.Data["json"] = &datainfo

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -161,7 +161,7 @@ module.exports = {
   },
   ignore: [
     'pages/oilsupplier/addtionaudit/*.*',
-    'pages/oilsupplier/annualaudit/*.*',
+    // 'pages/oilsupplier/annualaudit/*.*',
     'pages/oilsupplier/badrecord/*.*',
     // 'pages/oilsupplier/basisbuild/*.*',
     'pages/oilsupplier/compayaudit/*.*',

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

@@ -54,7 +54,7 @@
                    v-if="canadd && IsCompanyUser == 0">
           提交审批
         </el-button>
-        <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
+        <el-button style="float: right; padding: 6px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
       </div>
       <el-table :data="subfileList" border size="mini">
         <el-table-column label="操作" width="150" align="center" fixed>

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

@@ -842,14 +842,10 @@ import apiCert from '@/api/oilsupplier/suppliercert'
       }
       // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'))
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-          if (value < 1) {
-            callback(new Error('注册资金至少为1'))
-          } else {
-            callback()
-          }
+          callback()
         }
       }
 
@@ -1070,11 +1066,10 @@ import apiCert from '@/api/oilsupplier/suppliercert'
             trigger: 'change'
           }],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',

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

@@ -759,14 +759,10 @@
       }
       // 注册资金限制
       var checkMoney = (rule, value, callback) => {
-        if (!value) {
-          return callback(new Error('注册资金不能为空'))
+        if (value < 0) {
+          callback(new Error('注册资金不能小于0'))
         } else {
-          if (value < 1) {
-            callback(new Error('注册资金至少为1'))
-          } else {
-            callback()
-          }
+          callback()
         }
       }
 
@@ -970,11 +966,10 @@
             trigger: 'change'
           }],
 
-          RegCapital: [{
-            required: true,
-            validator: checkMoney,
-            trigger: 'change'
-          } ],
+          RegCapital: [
+            {required: true, validator: checkMoney, trigger: 'change'},
+            { type: 'number', message: '只能输入数字', trigger: 'blur' }
+          ],
           DepositBank: [{
             required: true,
             message: '请输入开户银行',

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -339,6 +339,7 @@
       }
     },
     created() {
+      console.log('++++++++++++++++++++++++++++++++++++++')
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       //查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
@@ -447,14 +448,19 @@
             api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
               if (res.data.code === 0) {
                 //保存成功后，初始化数据，变成修改
-                this.entityForm.Id = res.data.item;
-                this.initDatas();
+                this.entityForm.Id = res.data.item
+                this.initDatas()
                 this.addshow = false
                 this.$message({
                   type: 'success',
                   message: res.data.message
-                });
-
+                })
+              } else if (res.data.code === -3) {
+                this.$confirm(res.data.message + '，点击继续可继续进行年审')
+                  .then(_ => {
+                    this.addannualdirect()
+                  })
+                  .catch(_ => {})
               } else {
                 this.$message({
                   type: 'warning',
@@ -538,6 +544,7 @@
       },
 
       getselectsupplier() {
+        console.log('++==================++++++++')
         api.getSupList('01', this.$axios).then(res => {
           if (res.data.items.length != 0) {
             for (var i = 0; i < res.data.items.length; i++) {