前后:物资类二级修改,loading

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

@@ -946,10 +946,12 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 
 	var classall goodsaptitude.OilGoodsAptitudeClassView
 	var model goodsaptitudeclass.OilGoodsAptitudeClass
+	var goodsLevel goodsaptitude.OilGoodsAptitude
 	var classmodel []goodsaptitudeclass.OilGoodsAptitudeClass
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &classall)
+	json.Unmarshal(jsonBlob, &goodsLevel)
 	model.ModifiedOn = time.Now()
 	model.ModifiedBy = this.User.Realname
 	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -1068,6 +1070,12 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id4, &model, colsCode)
 		}
 	}
+
+	var model1 goodsaptitude.OilGoodsAptitude
+	colsGoods := []string{"GoodsLevel"}
+	model1.GoodsLevel = goodsLevel.GoodsLevel
+	svc.UpdateEntityBywheretbl(OilGoodsAptitudeName, &model1 , colsGoods, "ClassId = " + id)
+
 	if err == nil {
 		errinfo.Message = "修改成功！"
 		errinfo.Code = 0

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

@@ -276,10 +276,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物资级别">
+              <el-select v-model="goodsLevel" placeholder="请选择物资级别" style="width:100%"  size="mini">
+                <el-option label="一级" value="1"></el-option>
+                <el-option label="二级" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="codeeditshow = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="codeedit">修 改</el-button>
+        <el-button size="mini" type="primary" @click="codeedit" :loading="loading3">修 改</el-button>
       </span>
     </el-dialog>
     <el-dialog title="上传文件"  width="600px" :visible.sync="uploadshow">
@@ -511,6 +521,7 @@
         uploadshow: false,
         loading: false,
         codeeditshow: false,
+        loading3: false,
         classid: '',
         myclassid: '',
         deptsetVisible: false,
@@ -700,6 +711,7 @@
           ModifiedBy: ''
 
         },
+        goodsLevel: '',
         setForm: {
           SupplierTypeCode: '01',
           SupplierTypeName: '物资类',
@@ -1024,6 +1036,7 @@
         this.formData.Code4 = this.formData.Code4.replace(/^(\w{0})\w{6}(.*)$/, '$1' + val + '$2')
       },
       CodeNameEdit (val) {
+        this.goodsLevel = val.GoodsLevel
         this.myclassid = val.ClassId
         this.$axios.get('goodsaptitudeclass/getcodename/' + val.Code, {})
           .then(res => {
@@ -1036,7 +1049,10 @@
           })
       },
       codeedit () {
+        this.loading3 = true
+        this.formData.GoodsLevel = this.goodsLevel
         api.updateCodeEntity(this.myclassid, this.formData, this.$axios).then(res => {
+          this.loading3 = false
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.codeeditshow = false

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

@@ -246,7 +246,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="codeeditshow = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="codeedit">修 改</el-button>
+        <el-button size="mini" type="primary" @click="codeedit" :loading="loading3">修 改</el-button>
       </span>
     </el-dialog>
 
@@ -462,6 +462,7 @@
         qualificaListvisible: false,
         loading: false,
         codeeditshow: false,
+        loading3: false,
         classid: '',
         deptsetVisible: false,
         dialogVisible: false,
@@ -1115,7 +1116,9 @@
           })
       },
       codeedit() {
+        this.loading3 = true
         api.updateCodeEntity(this.myclassid, this.formData, this.$axios).then(res => {
+          this.loading3 = false
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
             this.codeeditshow = false