前后:资质配置准入范围添加

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

@@ -516,6 +516,19 @@ func (this *OilGoodsAptitudeController) AddEntity() {
 		this.ServeJSON()
 		return
 	}
+	if parentedId.ParentId == 0 {
+		where1 := " Code = " + Substr(model.Code, 0, 2)
+		code1 := svc.GetEntityByWhere(OilGoodsAptitudeClassName, where1, &classmodel)
+		if code1 {
+			errinfo.Message = "请选择父节点！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		} else {
+			model.Code = Substr(model.Code, 0, 2)
+		}
+	}
 	//where1 := " Name = " + model.Name
 	//name := svc.GetEntityByWhere(OilGoodsAptitudeClassName, where1, &classmodel)
 	//if name {

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

@@ -196,6 +196,19 @@ func (this *OilTechnologyServiceController) AddEntity() {
 		this.ServeJSON()
 		return
 	}
+	if parentedId.ParentId == 0 {
+		where1 := " Code = " + Substr(model.Code, 0, 2)
+		code1 := svc.GetEntityByWhere(OilTechnologyServiceClassName, where1, &classmodel)
+		if code1 {
+			errinfo.Message = "请选择父节点！"
+			errinfo.Code = -1
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+			return
+		} else {
+			model.Code = Substr(model.Code, 0, 2)
+		}
+	}
 	//where1 := " Name = " + model.Name
 	//name := svc.GetEntityByWhere(OilGoodsAptitudeClassName, where1, &classmodel)
 	//if name {

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

@@ -18,7 +18,7 @@
           </router-link>
         </span>
       </div>
-      <el-form label-width="240px" ref="EntityForm" :model="formData">
+      <el-form label-width="240px" ref="EntityForm" :rules="rules" :model="formData">
         <el-row>
 <!--          <el-col :span="8">-->
 <!--            <el-form-item v-if="serviceId == 'add'" label="父节点名称" label-width="110px">-->
@@ -28,13 +28,13 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="8">
-            <el-form-item label="名称" label-width="110px">
+            <el-form-item label="名称" label-width="110px" prop="Name">
               <el-input v-model="formData.Name" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label-width="110px" label="编码">
+            <el-form-item label-width="110px" label="编码" prop="Code">
               <el-input v-model="formData.Code" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -92,6 +92,14 @@
         goodsDialog: false,
         techList: [],
         serviceId: '',
+        rules: {
+          Name: [
+            {required: true, message: '名称不能为空', trigger: 'change'}
+          ],
+          Code: [
+            {required: true, message: '编码不能为空', trigger: 'change'}
+          ]
+        },
         formData: {
           Id: '',
           Code: '',

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

@@ -18,7 +18,7 @@
           </router-link>
         </span>
       </div>
-      <el-form label-width="240px" ref="EntityForm" :model="formData">
+      <el-form label-width="240px" ref="EntityForm" :rules="rules" :model="formData">
         <el-row>
           <!-- <el-col :span="8">
             <el-form-item v-if="serviceId == 'add'" label="编码" label-width="110px">
@@ -70,13 +70,13 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="名称" label-width="110px">
+            <el-form-item label="名称" label-width="110px" prop="Name">
               <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-form-item label-width="110px" label="编码" prop="Code">
               <el-input v-model="formData.Code" style="width:100%" :disabled="isdis" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -175,6 +175,14 @@
         isdis: false,
         auditerName: '',
         classid: '',
+        rules: {
+          Name: [
+            {required: true, message: '名称不能为空', trigger: 'change'}
+          ],
+          Code: [
+            {required: true, message: '编码不能为空', trigger: 'change'}
+          ]
+        },
         formData: {
           Id: '',
           Code: '',
@@ -183,7 +191,7 @@
           MiddleClassName: '',
           SmallClassName: '',
           GoodsName: '',
-          GoodsLevel: '',
+          GoodsLevel: '1',
           GoodsDesc: '',
           Standard: '',
           CompanyType: '',

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

@@ -18,7 +18,7 @@
           </router-link>
         </span>
       </div>
-      <el-form label-width="240px" ref="EntityForm" :model="formData">
+      <el-form label-width="240px" ref="EntityForm" :rules="rules" :model="formData">
         <el-row>
           <el-col :span="8" v-if="serviceId == 'add'">
             <el-form-item label="父节点名称" label-width="110px">
@@ -30,13 +30,13 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="名称" label-width="110px">
+            <el-form-item label="名称" label-width="110px" prop="Name">
               <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-form-item label-width="110px" label="编码" prop="Code">
               <el-input v-model="formData.Code" style="width:100%" :disabled="isdis" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -66,7 +66,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>
+            :props="orgtreeprops" ref="orgmanagetree">
           </el-tree>
         </el-col>
       </el-row>
@@ -94,6 +94,14 @@
     data() {
       return {
         auditerName: '',
+        rules: {
+          Name: [
+            {required: true, message: '名称不能为空', trigger: 'change'}
+          ],
+          Code: [
+            {required: true, message: '编码不能为空', trigger: 'change'}
+          ]
+        },
         classid: '',
         goodsDialog: false,
         orgtreelist: [],
@@ -306,13 +314,11 @@
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
             //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-
             if (!this.formData.Id) {
               this.addEntity();
             } else {
               this.updateEntity();
             }
-
           } else {
             return false
           }