前后:物资服务准入范围新增删除

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitudeclass/oilgoodsaptitudeclass.go

@@ -20,6 +20,10 @@ type OilGoodsAptitudeClass struct {
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }
 
+type ParentedId struct {
+	ParentId          int       `xorm:"not null default 0 comment('上级节点ID') INT(10)"`
+}
+
 type GoodsAptitudeClassList struct {
 	Id       int    `xorm:"not null pk autoincr INT(10)"`
 	Code     string `xorm:"not null default '' comment('编码') VARCHAR(8)"`

src/dashoo.cn/backend/api/business/oilsupplier/technologyserviceclass/oiltechnologyserviceclass.go

@@ -19,6 +19,10 @@ type OilTechnologyServiceClass struct {
 	ModifiedBy        string    `xorm:"VARCHAR(50)"`
 }
 
+type ParentedId struct {
+	ParentId          int       `xorm:"not null default 0 comment('上级节点ID') INT(10)"`
+}
+
 type Tmp_OilTechnologyServiceClass struct {
 	Id                int       `xorm:"not null pk autoincr INT(10)"`
 	Code              string    `xorm:"not null default '' comment('编码') VARCHAR(8)"`

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

@@ -367,26 +367,59 @@ a.F41,a.F42,a.F43,a.F44,a.F45,a.F46,b.Code, b.Name `
 // @Title 添加
 // @Description 新增
 // @Success	200	{object} controllers.Request
-// @router /add/:id [post]
+// @router /add [post]
 func (this *OilGoodsAptitudeController) AddEntity() {
-	classId := this.Ctx.Input.Param(":id")
-	var model goodsaptitude.OilGoodsAptitude
-	var jsonBlob = this.Ctx.Input.RequestBody
+	//ParentId := this.Ctx.Input.Param(":id")
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	var model goodsaptitudeclass.OilGoodsAptitudeClass
+	var classmodel goodsaptitudeclass.OilGoodsAptitudeClass
+	var parentedId goodsaptitudeclass.ParentedId
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &parentedId)
 	json.Unmarshal(jsonBlob, &model)
+	var errinfo ErrorDataInfo
+
+	where := " Code = " + model.Code
+	code := svc.GetEntityByWhere(OilGoodsAptitudeClassName, where, &classmodel)
+	if code {
+		errinfo.Message = "编码不能重复！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	//where1 := " Name = " + model.Name
+	//name := svc.GetEntityByWhere(OilGoodsAptitudeClassName, where1, &classmodel)
+	//if name {
+	//	errinfo.Message = "名称不能重复！"
+	//	errinfo.Code = -1
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+
+	model.ParentId = parentedId.ParentId
+	model.Edition = "1"
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.ClassId, _ = strconv.Atoi(classId)
-	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
-	_, err := svc.InsertEntityBytbl(""+OilGoodsAptitudeName, &model)
+	_, err := svc.InsertEntityBytbl(""+OilGoodsAptitudeClassName, &model)
+
+	var model2 goodsaptitude.OilGoodsAptitude
+	json.Unmarshal(jsonBlob, &model2)
+	model2.ClassId = model.Id
+	model2.Edition = "1"
+	model2.CreateOn = time.Now()
+	model2.CreateBy = this.User.Realname
+	model2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	_, err = svc.InsertEntityBytbl(""+OilGoodsAptitudeName, &model2)
 
-	var errinfo ErrorDataInfo
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = model.Id
+		errinfo.Item = model2.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -405,6 +438,7 @@ func (this *OilGoodsAptitudeController) AddEntity_2019() {
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	var model goodsaptitudeclass.OilGoodsAptitudeClass
 	var jsonBlob = this.Ctx.Input.RequestBody
+	var errinfo ErrorDataInfo
 	json.Unmarshal(jsonBlob, &model)
 	model.ParentId = -1
 	model.Edition = "2"
@@ -423,7 +457,6 @@ func (this *OilGoodsAptitudeController) AddEntity_2019() {
 
 	_, err = svc.InsertEntityBytbl(""+OilGoodsAptitudeName, &model2)
 
-	var errinfo ErrorDataInfo
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
@@ -938,9 +971,15 @@ func (this *OilGoodsAptitudeController) DeleteEntity() {
 	var model goodsaptitude.OilGoodsAptitude
 	var entityempty goodsaptitude.OilGoodsAptitude
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	svc.GetEntityById(Id, &model)
 	opdesc := "删除-" + Id
-	err := svc.DeleteOperationAndWriteLogBytbl(""+OilGoodsAptitudeName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, "", "钻井日报")
-	if err == nil {
+	err := svc.DeleteOperationAndWriteLogBytbl(""+OilGoodsAptitudeName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, "", "物资类准入范围子表删除")
+	var model1 goodsaptitudeclass.OilGoodsAptitudeClass
+	var entityempty1 goodsaptitudeclass.OilGoodsAptitudeClass
+	svc1 := goodsaptitudeclass.GetOilGoodsAptitudeClassService(utils.DBE)
+	opdesc1 := "删除-" + strconv.Itoa(model.ClassId)
+	err1 := svc1.DeleteOperationAndWriteLogBytbl(""+OilGoodsAptitudeClassName, BaseOperationLogName, strconv.Itoa(model.ClassId), &model1, &entityempty1, utils.ToStr(this.User.Id), this.User.Username, opdesc1, "", "物资类准入范围删除")
+	if err == nil && err1 == nil {
 		errinfo.Message = "删除成功"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo

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

@@ -21,14 +21,14 @@ import (
 	"dashoo.cn/backend/api/business/baseUser"
 	"dashoo.cn/business2/userRole"
 
-	//"dashoo.cn/backend/api/business/items"
-	"dashoo.cn/backend/api/business/oilsupplier/technologyservice"
 	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitude"
-	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
-	"dashoo.cn/business2/parameter"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
+	//"dashoo.cn/backend/api/business/items"
+	"dashoo.cn/backend/api/business/oilsupplier/technologyservice"
 	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/business2/parameter"
 	"dashoo.cn/utils"
 	. "github.com/linxGnu/goseaweedfs"
 )
@@ -174,28 +174,57 @@ func (this *OilTechnologyServiceController) GetEntity() {
 // @Title 添加
 // @Description 新增
 // @Success	200	{object} controllers.Request
-// @router /add/:id [post]
+// @router /add [post]
 func (this *OilTechnologyServiceController) AddEntity() {
-	classId := this.Ctx.Input.Param(":id")
-	var model technologyservice.OilTechnologyService
-	var jsonBlob = this.Ctx.Input.RequestBody
+	//classId := this.Ctx.Input.Param(":id")
 	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
-
+	var model technologyserviceclass.OilTechnologyServiceClass
+	var classmodel technologyserviceclass.OilTechnologyServiceClass
+	var parentedId technologyserviceclass.ParentedId
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &parentedId)
 	json.Unmarshal(jsonBlob, &model)
+	var errinfo ErrorDataInfo
+
+	where := " Code = " + model.Code
+	code := svc.GetEntityByWhere(OilTechnologyServiceClassName, where, &classmodel)
+	if code {
+		errinfo.Message = "编码不能重复！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	//where1 := " Name = " + model.Name
+	//name := svc.GetEntityByWhere(OilGoodsAptitudeClassName, where1, &classmodel)
+	//if name {
+	//	errinfo.Message = "名称不能重复！"
+	//	errinfo.Code = -1
+	//	this.Data["json"] = &errinfo
+	//	this.ServeJSON()
+	//	return
+	//}
+
+	model.ParentId = parentedId.ParentId
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-	model.ClassId ,_ = strconv.Atoi(classId)
-	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
+	_, err := svc.InsertEntityBytbl(""+OilTechnologyServiceClassName, &model)
 
-	_, err := svc.InsertEntityBytbl(""+OilTechnologyServiceName, &model)
+	var model2 technologyservice.OilTechnologyService
+	json.Unmarshal(jsonBlob, &model2)
+	model2.ClassId = model.Id
+	model2.CreateOn = time.Now()
+	model2.CreateBy = this.User.Realname
+	model2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	_, err = svc.InsertEntityBytbl(""+OilTechnologyServiceName, &model2)
 
-	var errinfo ErrorDataInfo
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
 		errinfo.Code = 0
-		errinfo.Item = model.Id
+		errinfo.Item = model2.Id
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
@@ -564,9 +593,15 @@ func (this *OilTechnologyServiceController) DeleteEntity() {
 	var model technologyservice.OilTechnologyService
 	var entityempty technologyservice.OilTechnologyService
 	svc := technologyservice.GetOilTechnologyServiceService(utils.DBE)
+	svc.GetEntityById(Id, &model)
 	opdesc := "删除-" + Id
-	err := svc.DeleteOperationAndWriteLogBytbl(""+OilTechnologyServiceName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, "", "钻井日报")
-	if err == nil {
+	err := svc.DeleteOperationAndWriteLogBytbl(""+OilTechnologyServiceName, BaseOperationLogName, Id, &model, &entityempty, utils.ToStr(this.User.Id), this.User.Username, opdesc, "", "服务类准入范围子表删除")
+	var model1 technologyserviceclass.OilTechnologyServiceClass
+	var entityempty1 technologyserviceclass.OilTechnologyServiceClass
+	svc1 := technologyserviceclass.GetOilTechnologyServiceClassService(utils.DBE)
+	opdesc1 := "删除-" + strconv.Itoa(model.ClassId)
+	err1 := svc1.DeleteOperationAndWriteLogBytbl(""+OilTechnologyServiceClassName, BaseOperationLogName, strconv.Itoa(model.ClassId), &model1, &entityempty1, utils.ToStr(this.User.Id), this.User.Username, opdesc1, "", "服务类准入范围删除")
+	if err == nil && err1 == nil {
 		errinfo.Message = "删除成功"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo

src/dashoo.cn/frontend_web/src/api/oilsupplier/goodsaptitude.js

@@ -31,9 +31,9 @@ export default {
       method: 'GET'
     })
   },
-  addEntity (entityId, formData, myAxios) {
+  addEntity (formData, myAxios) {
     return myAxios({
-      url: '/goodsaptitude/add/' + entityId,
+      url: '/goodsaptitude/add/',
       method: 'post',
       data: formData
     })

src/dashoo.cn/frontend_web/src/api/oilsupplier/technologyservice.js

@@ -18,9 +18,9 @@ export default {
       method: 'GET'
     })
   },
-  addEntity (entityId, formData, myAxios) {
+  addEntity (formData, myAxios) {
     return myAxios({
-      url: '/technologyservice/add/' + entityId,
+      url: '/technologyservice/add/',
       method: 'post',
       data: formData
     })

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button v-if="serviceId != 'add'" type="primary" size="mini" @click="deleteEntity">删除</el-button>
           <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
           <router-link :to="'/oilsupplier/basisbuild'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -208,6 +209,37 @@
           console.error(err)
         })
       },
+      // 删除
+      deleteEntity () {
+        console.log(this.formData.Id, 'WWW')
+        let _this = this
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            _this.$axios.delete('basisbuild/delete/' + this.formData.Id, {})
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: response.data.message
+                  })
+                  _this.$router.push('/oilsupplier/basisbuild')
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: response.data.message
+                  })
+                }
+              })
+              .catch(function (error) {
+                console.log(error)
+              })
+          })
+          .catch(() => {})
+      },
 
       //保存信息
       saveEntity() {

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" v-if="serviceId != 'add'" size="mini" @click="deleteEntity">删除</el-button>
           <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
           <router-link :to="'/oilsupplier/goodsaptitude'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -60,21 +61,36 @@
           </el-col> -->
 
           <el-col :span="8" v-if="serviceId == 'add'">
-            <el-form-item label="名称" label-width="110px">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择名称">
+            <el-form-item label="父节点名称" label-width="110px">
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择父节点名称">
                 <el-button slot="append" placeholder="选择" @click="goodsDialog = true">选择</el-button>
               </el-input>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
           <el-col :span="8">
-            <el-form-item label="物资级别" label-width="110px">
-              <el-select size="mini" style="width:100px" v-model="formData.GoodsLevel" placeholder="请选择物资级别">
+            <el-form-item label="名称" label-width="110px">
+              <el-input v-model="formData.Name" :disabled="isdis" placeholder="请输入">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="110px" label="编码">
+              <el-input v-model="formData.Code" style="width:100%" :disabled="isdis" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label="物资级别" label-width="110px">
+              <el-select v-model="formData.GoodsLevel" placeholder="请选择物资级别">
                 <el-option label="一级" value="1"></el-option>
                 <el-option label="二级" value="2"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+
 
           <el-col :span="8">
             <el-form-item v-if="serviceId == 'add'" label="产品说明" label-width="110px">
@@ -86,12 +102,14 @@
               <el-input v-model="formData.Standard" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
             <el-form-item v-if="serviceId == 'add'" label="供应商类型" label-width="110px">
               <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+
           <el-col :span="16">
             <el-form-item v-if="serviceId == 'add'" label="备注" label-width="110px">
               <el-input v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
@@ -111,7 +129,7 @@
       <el-row :gutter="20" style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
         <el-col :span="20">
           <el-tree highlight-current :expand-on-click-node="true" node-key="CodeName" :data="orgtreelist"
-            :props="orgtreeprops" ref="orgmanagetree" show-checkbox lazy :load="getChildrens" :filter-node-method="filterNode">
+            :props="orgtreeprops" ref="orgmanagetree" check-on-click-node lazy :load="getChildrens" :filter-node-method="filterNode">
           </el-tree>
         </el-col>
       </el-row>
@@ -147,6 +165,7 @@
           children: 'children',
           isLeaf: 'Leaf'
         },
+        isdis: false,
         auditerName: '',
         classid: '',
         formData: {
@@ -245,25 +264,29 @@
         })
       },
       selectgood () {
-        let val = this.$refs.orgmanagetree.getCheckedNodes()
-        this.checkList = []
-        for (var i = 0; i < val.length; i++) {
-          if (val[i].Code.length == 8) {
-            this.checkList.push(val[i])
+        // let val = this.$refs.orgmanagetree.getCheckedNodes()
+        let val = this.$refs.orgmanagetree.getCurrentNode()
+        console.log(val, '122')
+        if (val) {
+          if (val.Code.length == 8) {
+            this.$message({
+              type: 'warning',
+              message: '不能选择最小分类！'
+            })
+            return
           }
+          this.auditerName = val.Name
+          this.formData.Code = val.Code + '00'
+          // this.formData.Name = this.checkList[0].Name
+          // this.classid = val.Id
+          this.formData.ParentId = parseInt(val.Id)
+        } else {
+          this.auditerName = ''
+          this.formData.Code = '00'
+          // this.classid = 1
+          this.formData.ParentId = 0
         }
-        if (this.checkList.length > 1){
-          this.$message({
-            type: 'warning',
-            message: '只能选择一个分类！'
-          })
-          return
-        }else if(this.checkList.length == 1) {
-          this.auditerName = this.checkList[0].Name
-           this.formData.Code = this.checkList[0].Code
-           this.formData.Name = this.checkList[0].Name
-           this.classid = this.checkList[0].Id
-        }
+
         this.goodsDialog = false
       },
       //获取下一级所有分类
@@ -297,6 +320,8 @@
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data;
+            this.isdis = true
+            console.log(this.isdis, '223')
           }).catch(err => {
             console.error(err)
           });
@@ -311,7 +336,37 @@
           console.error(err)
         })
       },
-
+      // 删除
+      deleteEntity () {
+        console.log(this.formData.Id, 'WWW')
+        let _this = this
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            _this.$axios.delete('goodsaptitude/delete/' + this.formData.Id, {})
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: response.data.message
+                  })
+                  _this.$router.push('/oilsupplier/goodsaptitude')
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: response.data.message
+                  })
+                }
+              })
+              .catch(function (error) {
+                console.log(error)
+              })
+          })
+          .catch(() => {})
+      },
       //保存信息
       saveEntity() {
         this.$refs['EntityForm'].validate((valid) => {
@@ -331,7 +386,8 @@
       },
 
       addEntity() {
-        api.addEntity(this.classid, this.formData, this.$axios).then(res => {
+        console.log(this.formData, '嗯嗯嗯')
+        api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.formData.Id = res.data.item;
@@ -340,7 +396,7 @@
               type: 'success',
               message: res.data.message
             });
-
+            this.$router.push('/oilsupplier/goodsaptitude')
           } else {
             this.$message({
               type: 'warning',

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

@@ -65,7 +65,7 @@
         <el-table-column v-for="column in tableColumns" :prop="column.prop" sortable :width="column.width"
           :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="column.prop != 'GoodsLevel'">{{ transferStr(scope.row[column.prop]) }}</span>
+            <span v-if="(column.prop != 'GoodsLevel' && column.prop != 'GoodsDesc' && column.prop != 'Standard' && column.prop != 'CompanyType')">{{ transferStr(scope.row[column.prop]) }}</span>
             <span v-else>{{ (scope.row[column.prop]) }}</span>
           </template>
         </el-table-column>
@@ -332,7 +332,7 @@
           <el-table-column v-for="column in tableColumns" :prop="column.prop" sortable :width="column.width"
                            :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span v-if="column.prop != 'GoodsLevel'">{{ transferStr(scope.row[column.prop]) }}</span>
+              <span v-if="column.prop != 'GoodsLevel'">{{ transferStr(scope.row[column.prop], column.prop) }}</span>
               <span v-else>{{ (scope.row[column.prop]) }}</span>
             </template>
           </el-table-column>

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

@@ -11,6 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
+          <el-button type="primary" v-if="serviceId != 'add'" size="mini" @click="deleteEntity">删除</el-button>
           <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
           <router-link :to="'/oilsupplier/technologyservice'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -19,22 +20,31 @@
       </div>
       <el-form label-width="240px" ref="EntityForm" :model="formData">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="8" v-if="serviceId == 'add'">
             <el-form-item label="父节点名称" label-width="110px">
-              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择名称">
+              <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择父节点名称">
                 <el-button slot="append" placeholder="选择" @click="goodsDialog = true">选择</el-button>
               </el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="名称" label-width="110px">
-              <el-input v-model="formData.Name" placeholder="请输入">
+              <el-input v-model="formData.Name" :disabled="isdis" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label-width="110px" label="编码">
-              <el-input v-model="formData.Code" style="width:100%" placeholder="请输入"></el-input>
+              <el-input v-model="formData.Code" style="width:100%" :disabled="isdis" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="16">
+            <el-form-item v-if="serviceId == 'add'" label="备注" label-width="110px">
+              <el-input v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="8">
@@ -170,6 +180,7 @@
 
         },
         dynamicTableColumns: [],
+        isdis: false,
         checkList: []
         //下拉选择项
         //wellNoOptions: [],
@@ -213,32 +224,38 @@
             console.error(err)
           })
       },
-      selectgood() {
-        let val = this.$refs.orgmanagetree.getCheckedNodes()
-        this.checkList = []
-        for (var i = 0; i < val.length; i++) {
-          if (!val[i].children || val[i].children.length <= 0) {
-            this.checkList.push(val[i])
+      selectgood () {
+        // let val = this.$refs.orgmanagetree.getCheckedNodes()
+        let val = this.$refs.orgmanagetree.getCurrentNode()
+        console.log(val, '122')
+        if (val) {
+          if (val.Code.length == 8) {
+            this.$message({
+              type: 'warning',
+              message: '不能选择最小分类！'
+            })
+            return
           }
-        }
-        if (this.checkList.length > 1) {
-          this.$message({
-            type: 'warning',
-            message: '只能选择一个分类！'
-          })
-          return
-        } else if (this.checkList.length == 1) {
-          this.auditerName = this.checkList[0].Name
-          this.formData.Code = this.checkList[0].Code + "00"
+          this.auditerName = val.Name
+          this.formData.Code = val.Code + '00'
           // this.formData.Name = this.checkList[0].Name
-          this.classid = this.checkList[0].id
+          // this.classid = val.id
+          console.log(val.id, '122')
+          this.formData.ParentId = parseInt(val.id)
+        } else {
+          this.auditerName = ''
+          this.formData.Code = '00'
+          // this.classid = 1
+          this.formData.ParentId = 0
         }
+
         this.goodsDialog = false
       },
       initDatas() {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data;
+            this.isdis = true
           }).catch(err => {
             console.error(err)
           });
@@ -253,7 +270,37 @@
           console.error(err)
         })
       },
-
+      // 删除
+      deleteEntity () {
+        console.log(this.formData.Id, 'WWW')
+        let _this = this
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(() => {
+            _this.$axios.delete('technologyservice/delete/' + this.formData.Id, {})
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: response.data.message
+                  })
+                  _this.$router.push('/oilsupplier/technologyservice')
+                } else {
+                  _this.$message({
+                    type: 'warning',
+                    message: response.data.message
+                  })
+                }
+              })
+              .catch(function (error) {
+                console.log(error)
+              })
+          })
+          .catch(() => {})
+      },
       //保存信息
       saveEntity() {
         this.$refs['EntityForm'].validate((valid) => {
@@ -273,7 +320,7 @@
       },
 
       addEntity() {
-        api.addEntity(this.classid, this.formData, this.$axios).then(res => {
+        api.addEntity(this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.formData.Id = res.data.item;
@@ -282,6 +329,7 @@
               type: 'success',
               message: res.data.message
             });
+            this.$router.push('/oilsupplier/technologyservice')
 
           } else {
             this.$message({