bug rep

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

@@ -1405,7 +1405,7 @@ func (this *OilSupplierController) GetDictListByStatus() {
 
 	// 所有二级单位
 	var allunitorglist []organize.Base_Organize
-	where = "Category='Unit'"
+	where = "Category='Unit' and ParentId = '100000001'"
 	orgsvc.GetEntities(&allunitorglist, where)
 	dictList["Allunitorglist"] = allunitorglist
 

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

@@ -542,6 +542,7 @@ func (this *OilSupplierCertSubController) AddTechBus() {
 				svc.InsertEntityBytbl(OilSupplierCert2FileName, &cert2File)
 				if strings.Contains(mustField, needList[i].FileName+",") {
 					entity.SupplierTypeCode = "000"
+					entity.IsManuf = "0"
 				} else {
 					entity.SupplierTypeCode = dataother.SupplierTypeCode
 				}
@@ -660,6 +661,7 @@ func (this *OilSupplierCertSubController) AddBusiness() {
 
 			if strings.Contains(mustField, needList[i].FileName+",") {
 				entity.SupplierTypeCode = "000"
+				entity.IsManuf = "0"
 			} else {
 				entity.SupplierTypeCode = model.SupplierTypeCode
 			}

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

@@ -86,23 +86,22 @@
                 </el-form-item>
               </el-col>
 
-              <!--<el-col :span="8">-->
-                <!--<el-form-item label="级别">-->
-                  <!--<el-select v-model="formData.Grade"-->
-                             <!--placeholder="请选择级别"-->
-                             <!--disabled-->
-                             <!--:class="changedForm['Grade'] ? 'modified-form-input' : ''"-->
-                             <!--style="width: 100%"-->
-                             <!--@change="GradeChange">-->
-                    <!--<el-option-->
-                      <!--v-for="item in GradeOptions"-->
-                      <!--:key="item.value"-->
-                      <!--:label="item.label"-->
-                      <!--:value="item.value">-->
-                    <!--</el-option>-->
-                  <!--</el-select>-->
-                <!--</el-form-item>-->
-              <!--</el-col>-->
+              <el-col :span="8">
+                <el-form-item label="级别" prop="Gradechange">
+                  <el-select v-model="formData.Grade"
+                             placeholder="请选择级别"
+                             :class="changedForm['Grade'] ? 'modified-form-input' : ''"
+                             style="width: 100%"
+                             @change="GradeChange">
+                    <el-option
+                      v-for="item in GradeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="管理单位">
@@ -1583,6 +1582,9 @@
         if (val === '1') {
           this.formData.MgrUnit = '中油集团公司'
         }
+        this.$alert('确认变更企业级别后会删除不符合该级别的准入项和资质！', '变更确认', {
+          confirmButtonText: '确定',
+        })
       },
       InStyleChange (val) {
         if (val === '2') {
@@ -2004,30 +2006,34 @@
       },
       // 保存信息变更数据
       saveinfochange () {
-        let AllInfochangeItemList = {
-          SupplierId: this.serviceId,
-          MInfoId: this.MInfoId,
-          InfochangeForm: this.infochangeItemList
-        }
-        // console.log('----', AllInfochangeItemList)
-        // debugger
-        api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            // 保存成功后，初始化数据，变成修改
-            this.initDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
+      this.$refs['formData'].validate((valid) => {
+        if (valid) {
+            let AllInfochangeItemList = {
+            SupplierId: this.serviceId,
+            MInfoId: this.MInfoId,
+            InfochangeForm: this.infochangeItemList
           }
-        }).catch(err => {
-          console.error(err)
-        })
+          // console.log('----', AllInfochangeItemList)
+          // debugger
+          api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
+            if (res.data.code === 0) {
+              // 保存成功后，初始化数据，变成修改
+              this.initDatas()
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      })
       },
       chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist()