更改增项分类

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -12,7 +12,7 @@ type OilSupplierCertAppend struct {
 	RecUnitFlag    string    `xorm:"comment('推荐单位的级联Id标记') VARCHAR(200)"`
 	RecUnitId      string    `xorm:"comment('推荐单位编码') VARCHAR(50)"`
 	RecUnitName    string    `xorm:"comment('推荐单位名称') VARCHAR(50)"`
-	WorkRange      string    `xorm:"comment('申请准入的范围') VARCHAR(50)"`
+	AppendType     string    `xorm:"comment('增项类别(1 物资类，2 基建类，3 技术服务类)') VARCHAR(10)"`
 	DenyReason     string    `xorm:"comment('退回原因') VARCHAR(50)"`
 	AuditDate      time.Time `xorm:"comment('审核日期') DATETIME"`
 	Status         string    `xorm:"comment('状态标识') VARCHAR(50)"`

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

@@ -1,15 +1,16 @@
 package oilsupplier
 
 import (
-	"dashoo.cn/backend/api/business/oilclassorgsetting"
-	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitude"
-	"dashoo.cn/business2/organize"
-	"dashoo.cn/business2/permission"
 	"encoding/json"
 	"strconv"
 	"strings"
 	"time"
 
+	"dashoo.cn/backend/api/business/oilclassorgsetting"
+	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitude"
+	"dashoo.cn/business2/organize"
+	"dashoo.cn/business2/permission"
+
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/backend/api/business/oilsupplier/classorgsetting"
 	. "dashoo.cn/backend/api/controllers"
@@ -24,7 +25,7 @@ type OilClassOrgSettingController struct {
 type OrganizeAjaxModel struct {
 	Organize         []organize.Base_Organizetree
 	SelectedOrganize []int
-	AuditStepCode     string
+	AuditStepCode    string
 }
 
 // @Title 获取列表
@@ -323,22 +324,22 @@ func (this *OilClassOrgSettingController) AddOrganize() {
 	supplierTypeCode := this.GetString("SupplierTypeCode")
 	supplierTypeName := this.GetString("SupplierTypeName")
 	auditStepCode := this.GetString("AuditStepCode")
-	auditStepName:= this.GetString("AuditStepName")
+	auditStepName := this.GetString("AuditStepName")
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 
 	var err error
 	where := "classId=" + classid
 	svc.DeleteEntityBytbl(OilClassOrgSettingName, where)
 	var model oilclassorgsetting.OilClassOrgSetting
-	if (len(organizeids) > 0) {
+	if len(organizeids) > 0 {
 		for i := 0; i < len(organizeids); i++ {
 			where := "Id=" + organizeids[i]
 			svc.GetEntitysByWhere("Base_Organize", where, &organizes)
 		}
-		if (organizes != nil) {
-			for i := 0;i < len(organizes);i++ {
+		if organizes != nil {
+			for i := 0; i < len(organizes); i++ {
 				var model oilclassorgsetting.OilClassOrgSetting
-				model.ClassId,_ = strconv.Atoi(classid)
+				model.ClassId, _ = strconv.Atoi(classid)
 				model.OrganizeId = organizes[i].Id
 				model.OrganizeName = organizes[i].Fullname
 				model.AuditStepCode = auditStepCode
@@ -373,7 +374,7 @@ func (this *OilClassOrgSettingController) AddOrganize() {
 // @Success	200	{object} controllers.Request
 // @router /getdepartment [get]
 func (this *OilClassOrgSettingController) DepartmentListGet() {
-	id := this.GetString("id") //
+	id := this.GetString("id")         //
 	stcode := this.GetString("stcode") //
 	svc := permission.GetPermissionService(utils.DBE)
 	currentuser := this.User
@@ -393,4 +394,4 @@ func (this *OilClassOrgSettingController) DepartmentListGet() {
 	rest := OrganizeAjaxModel{organizemodu, selected, auditStepCode}
 	this.Data["json"] = &rest
 	this.ServeJSON()
-}
+}

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

@@ -39,7 +39,7 @@ func (this *OilSupplierCertAppendController) GetList() {
 	ApplyDate := this.GetString("ApplyDate")
 	RecUnitId := this.GetString("RecUnitId")
 	RecUnitName := this.GetString("RecUnitName")
-	WorkRange := this.GetString("WorkRange")
+	AppendType := this.GetString("AppendType")
 	DenyReason := this.GetString("DenyReason")
 	AuditDate := this.GetString("AuditDate")
 	Remark := this.GetString("Remark")
@@ -57,8 +57,8 @@ func (this *OilSupplierCertAppendController) GetList() {
 		where = where + " and RecUnitName like '%" + RecUnitName + "%'"
 	}
 
-	if WorkRange != "" {
-		where = where + " and WorkRange like '%" + WorkRange + "%'"
+	if AppendType != "" {
+		where = where + " and AppendType like '" + AppendType + "'"
 	}
 
 	if DenyReason != "" {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -161,7 +161,7 @@
           RecUnitFlag: '',//推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          WorkRange: '', //申请准入的范围
+          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '',//备注
         },
         dialogVisible: false,//增项分类dialog
@@ -355,6 +355,7 @@
       //添加增项信息
       addAppend() {
         let _this = this
+        _this.formData.AppendType = '2'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
           .then(res => {
             if (res.data.code === 0) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -161,7 +161,7 @@
           RecUnitFlag: '',//推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          WorkRange: '', //申请准入的范围
+          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '',//备注
         },
         dialogVisible: false,//增项分类dialog
@@ -355,6 +355,7 @@
       //添加增项信息
       addAppend() {
         let _this = this
+        _this.formData.AppendType = '1'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
           .then(res => {
             if (res.data.code === 0) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -161,7 +161,7 @@
           RecUnitFlag: '',//推荐单位的级联Id标记
           RecUnitId: '', //推荐单位编码
           RecUnitName: '', //推荐单位名称
-          WorkRange: '', //申请准入的范围
+          AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '',//备注
         },
         dialogVisible: false,//增项分类dialog
@@ -355,6 +355,7 @@
       //添加增项信息
       addAppend() {
         let _this = this
+        _this.formData.AppendType = '3'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)
           .then(res => {
             if (res.data.code === 0) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -44,7 +44,11 @@
         </el-table-column>
         <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
-        <!-- <el-table-column prop="WorkRange" label="申请准入的范围" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ checkAppendType(scope.row.AppendType) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -89,12 +93,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="申请准入的范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="退回原因">
               <el-input size="mini" v-model="searchForm.DenyReason" style="width:100%" placeholder="请输入"></el-input>
@@ -142,13 +140,6 @@
     name: 'oilsuppliercertappend',
 
     data() {
-      var CheckSelectedOption = (rule, value, callback) => {
-        if (this.dialogSelectedOptList && this.dialogSelectedOptList.length < 1) {
-          callback(new Error('请选择增项'))
-        } else {
-          callback()
-        }
-      }
       return {
         dialogVisible: false,//高级查询
         //列表数据
@@ -173,7 +164,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          WorkRange: '',
+          AppendType: '2', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -193,28 +184,6 @@
           label: 'Name',
           children: 'children'
         },
-        dialogSelectedOptList: [],
-        dialogFormData: {
-          Id: '',
-          SupplierId: '',
-          SupplierCertId: '',
-          ApplyDate: '',
-          RecUnitId: '',
-          RecUnitName: '',
-          WorkRange: '',
-          DenyReason: '',
-          AuditDate: '',
-          Status: '',
-          Remark: '',
-        },
-        //表单规则
-        rules: {
-          checkSelectedOptList2: [{
-            required: true,
-            validator: CheckSelectedOption,
-            trigger: 'blur'
-          }],
-        },
       }
     },
     created() {
@@ -345,6 +314,17 @@
         this.initData()
       },
 
+      //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
+      checkAppendType(val) {
+        if (val == '1') {
+          return '物资类'
+        } else if (val == '2') {
+          return '基建类'
+        } else if (val == '3') {
+          return '技术服务类'
+        }
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 物资类列表
         </span>
         <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplierappend/2/goodsdataopera'">
+          <router-link :to="'/oilsupplier/supplierappend/1/goodsdataopera'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
         </span>
@@ -44,7 +44,11 @@
         </el-table-column>
         <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
-        <!-- <el-table-column prop="WorkRange" label="申请准入的范围" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ checkAppendType(scope.row.AppendType) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -89,12 +93,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="申请准入的范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="退回原因">
               <el-input size="mini" v-model="searchForm.DenyReason" style="width:100%" placeholder="请输入"></el-input>
@@ -142,13 +140,6 @@
     name: 'oilsuppliercertappend',
 
     data() {
-      var CheckSelectedOption = (rule, value, callback) => {
-        if (this.dialogSelectedOptList && this.dialogSelectedOptList.length < 1) {
-          callback(new Error('请选择增项'))
-        } else {
-          callback()
-        }
-      }
       return {
         dialogVisible: false,//高级查询
         //列表数据
@@ -173,7 +164,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          WorkRange: '',
+          AppendType: '1', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -193,28 +184,6 @@
           label: 'Name',
           children: 'children'
         },
-        dialogSelectedOptList: [],
-        dialogFormData: {
-          Id: '',
-          SupplierId: '',
-          SupplierCertId: '',
-          ApplyDate: '',
-          RecUnitId: '',
-          RecUnitName: '',
-          WorkRange: '',
-          DenyReason: '',
-          AuditDate: '',
-          Status: '',
-          Remark: '',
-        },
-        //表单规则
-        rules: {
-          checkSelectedOptList2: [{
-            required: true,
-            validator: CheckSelectedOption,
-            trigger: 'blur'
-          }],
-        },
       }
     },
     created() {
@@ -268,7 +237,7 @@
       editData(row) {
         let _this = this
         _this.$router.push({
-          path: `/oilsupplier/supplierappend/2/goodsdataopera`,
+          path: `/oilsupplier/supplierappend/1/goodsdataopera`,
           query: {
             Id: row.Id,
             editFlag: 1 //编辑标记： 1 修改，0 不修改
@@ -345,6 +314,17 @@
         this.initData()
       },
 
+      //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
+      checkAppendType(val) {
+        if (val == '1') {
+          return '物资类'
+        } else if (val == '2') {
+          return '基建类'
+        } else if (val == '3') {
+          return '技术服务类'
+        }
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -10,7 +10,7 @@
           <i class="icon icon-table2"></i> 技术服务类列表
         </span>
         <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplierappend/2/techdataopera'">
+          <router-link :to="'/oilsupplier/supplierappend/3/techdataopera'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
         </span>
@@ -44,7 +44,11 @@
         </el-table-column>
         <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
-        <!-- <el-table-column prop="WorkRange" label="申请准入的范围" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
+        <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ checkAppendType(scope.row.AppendType) }}
+          </template>
+        </el-table-column>
         <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -89,12 +93,6 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="申请准入的范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
           <el-col :span="12">
             <el-form-item label="退回原因">
               <el-input size="mini" v-model="searchForm.DenyReason" style="width:100%" placeholder="请输入"></el-input>
@@ -142,13 +140,6 @@
     name: 'oilsuppliercertappend',
 
     data() {
-      var CheckSelectedOption = (rule, value, callback) => {
-        if (this.dialogSelectedOptList && this.dialogSelectedOptList.length < 1) {
-          callback(new Error('请选择增项'))
-        } else {
-          callback()
-        }
-      }
       return {
         dialogVisible: false,//高级查询
         //列表数据
@@ -173,7 +164,7 @@
           ApplyDate: '',
           RecUnitId: '',
           RecUnitName: '',
-          WorkRange: '',
+          AppendType: '3', //增项类别(1 物资类，2 基建类，3 技术服务类)
           DenyReason: '',
           AuditDate: '',
           Status: '',
@@ -193,28 +184,6 @@
           label: 'Name',
           children: 'children'
         },
-        dialogSelectedOptList: [],
-        dialogFormData: {
-          Id: '',
-          SupplierId: '',
-          SupplierCertId: '',
-          ApplyDate: '',
-          RecUnitId: '',
-          RecUnitName: '',
-          WorkRange: '',
-          DenyReason: '',
-          AuditDate: '',
-          Status: '',
-          Remark: '',
-        },
-        //表单规则
-        rules: {
-          checkSelectedOptList2: [{
-            required: true,
-            validator: CheckSelectedOption,
-            trigger: 'blur'
-          }],
-        },
       }
     },
     created() {
@@ -268,7 +237,7 @@
       editData(row) {
         let _this = this
         _this.$router.push({
-          path: `/oilsupplier/supplierappend/2/techdataopera`,
+          path: `/oilsupplier/supplierappend/3/techdataopera`,
           query: {
             Id: row.Id,
             editFlag: 1 //编辑标记： 1 修改，0 不修改
@@ -345,6 +314,17 @@
         this.initData()
       },
 
+      //判断增项类别，(1 物资类，2 基建类，3 技术服务类)
+      checkAppendType(val) {
+        if (val == '1') {
+          return '物资类'
+        } else if (val == '2') {
+          return '基建类'
+        } else if (val == '3') {
+          return '技术服务类'
+        }
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'