bug

Signed-off-by: lijunqing <lijunqing@dashoo.cn>

src/dashoo.cn/backend/api/business/oilsupplier/goodsaptitude/oilgoodsaptitude.go

@@ -57,6 +57,7 @@ type OilGoodsAptitude struct {
 	F44               string    `xorm:"default '' VARCHAR(2)"`
 	F45               string    `xorm:"default '' VARCHAR(2)"`
 	F46               string    `xorm:"default '' VARCHAR(2)"`
+	Edition           string    `xorm:"not null default '' VARCHAR(10)"`
 	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	DeletionStateCode int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	CreateOn          time.Time `xorm:"DATETIME"`

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

@@ -9,6 +9,7 @@ type OilGoodsAptitudeClass struct {
 	Code              string    `xorm:"not null default '' comment('编码') VARCHAR(8)"`
 	Name              string    `xorm:"not null default '' comment('名称') VARCHAR(50)"`
 	ParentId          int       `xorm:"not null default 0 comment('上级节点ID') INT(10)"`
+	Edition           string    `xorm:"not null default '' VARCHAR(10)"`
 	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
 	DeletionStateCode int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	CreateOn          time.Time `xorm:"DATETIME"`

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

@@ -214,6 +214,28 @@ func (this *OilGoodsAptitudeController) GetEntity() {
 	this.ServeJSON()
 }
 
+// @Title 获取实体
+// @Description 获取实体
+// @Success 200 {object}
+// @router /get_2019/:id [get]
+func (this *OilGoodsAptitudeController) GetEntity_2019() {
+	Id := this.Ctx.Input.Param(":id")
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+
+	var tempMap []map[string]string
+	sql := `select a.Id,a.ClassId,a.F01,a.F02,a.F03,a.F04,a.F05,a.F06,a.F07,a.F08,a.F09,a.F10,
+a.F11,a.F12,a.F13,a.F14,a.F15,a.F16,a.F17,a.F18,a.F19,a.F20, 
+a.F21,a.F22,a.F23,a.F24,a.F25,a.F26,a.F27,a.F28,a.F29,a.F30, 
+a.F31,a.F32,a.F33,a.F34,a.F35,a.F36,a.F37,a.F38,a.F39,a.F40, 
+a.F41,a.F42,a.F43,a.F44,a.F45,a.F46,b.Code, b.Name `
+	sql += ` from ` + OilGoodsAptitudeName + ` a `
+	sql += ` left join ` + OilGoodsAptitudeClassName + " b on b.Id = a.ClassId"
+	sql += ` where a.Id='`+Id+`'`
+	tempMap,_=svc.DBE.QueryString(sql)
+
+	this.Data["json"] = &tempMap
+	this.ServeJSON()
+}
 // @Title 添加
 // @Description 新增
 // @Success	200	{object} controllers.Request
@@ -247,6 +269,49 @@ func (this *OilGoodsAptitudeController) AddEntity() {
 	}
 }
 
+
+// @Title 添加
+// @Description 新增
+// @Success	200	{object} controllers.Request
+// @router /add_2019 [post]
+func (this *OilGoodsAptitudeController) AddEntity_2019() {
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+	var model goodsaptitudeclass.OilGoodsAptitudeClass
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+	model.ParentId=-1
+	model.Edition="2"
+	model.CreateOn = time.Now()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	_, err := svc.InsertEntityBytbl(""+OilGoodsAptitudeClassName, &model)
+
+	var model2 goodsaptitude.OilGoodsAptitude
+	json.Unmarshal(jsonBlob, &model2)
+	model2.ClassId=model.Id
+	model2.Edition="2"
+	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 = model2.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "添加失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 // @Title 修改实体
 // @Description 修改实体
 // @Success	200	{object} controllers.Request
@@ -418,6 +483,163 @@ func (this *OilGoodsAptitudeController) UpdateEntity() {
 	}
 }
 
+
+// @Title 修改实体
+// @Description 修改实体
+// @Success	200	{object} controllers.Request
+// @router /update_2019/:id [post]
+func (this *OilGoodsAptitudeController) UpdateEntity_2019() {
+	id := this.Ctx.Input.Param(":id")
+	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
+
+	var errinfo ErrorInfo
+	if id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+
+	var model goodsaptitude.OilGoodsAptitude
+	var jsonBlob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonBlob, &model)
+
+	model.ModifiedOn = time.Now()
+	model.ModifiedBy = this.User.Realname
+	model.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols := []string{
+		"F01",
+
+		"F02",
+
+		"F03",
+
+		"F04",
+
+		"F05",
+
+		"F06",
+
+		"F07",
+
+		"F08",
+
+		"F09",
+
+		"F10",
+
+		"F11",
+
+		"F12",
+
+		"F13",
+
+		"F14",
+
+		"F15",
+
+		"F16",
+
+		"F17",
+
+		"F18",
+
+		"F19",
+
+		"F20",
+
+		"F21",
+
+		"F22",
+
+		"F23",
+
+		"F24",
+
+		"F25",
+
+		"F26",
+
+		"F27",
+
+		"F28",
+
+		"F29",
+
+		"F30",
+
+		"F31",
+
+		"F32",
+
+		"F33",
+
+		"F34",
+
+		"F35",
+
+		"F36",
+
+		"F37",
+
+		"F38",
+
+		"F39",
+
+		"F40",
+
+		"F41",
+
+		"F42",
+
+		"F43",
+
+		"F44",
+
+		"F45",
+
+		"F46",
+
+		"ModifiedOn",
+
+		"ModifiedUserId",
+
+		"ModifiedBy",
+	}
+	err := svc.UpdateEntityBytbl(""+OilGoodsAptitudeName, id, &model, cols)
+
+	var model2 goodsaptitudeclass.OilGoodsAptitudeClass
+	json.Unmarshal(jsonBlob, &model2)
+	model2.ModifiedOn = time.Now()
+	model2.ModifiedBy = this.User.Realname
+	model2.ModifiedUserId, _ = utils.StrTo(this.User.Id).Int()
+
+	cols2 := []string{
+		"Code",
+
+		"Name",
+
+		"ModifiedOn",
+
+		"ModifiedUserId",
+
+		"ModifiedBy",
+	}
+	err = svc.UpdateEntityBytbl(""+OilGoodsAptitudeClassName, model.ClassId, &model2, cols2)
+	if err == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
 // @Title 修改实体
 // @Description 修改实体
 // @Success	200	{object} controllers.Request

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

@@ -25,6 +25,12 @@ export default {
       method: 'GET'
     })
   },
+  getEntity_2019 (entityId, myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/get_2019/' + entityId,
+      method: 'GET'
+    })
+  },
   addEntity (entityId, formData, myAxios) {
     return myAxios({
       url: '/goodsaptitude/add/' + entityId,
@@ -32,6 +38,13 @@ export default {
       data: formData
     })
   },
+  addEntity_2019 (formData, myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/add_2019',
+      method: 'post',
+      data: formData
+    })
+  },
   updateEntity (entityId, formData, myAxios) {
     return myAxios({
       url: '/goodsaptitude/update/' + entityId,
@@ -39,6 +52,13 @@ export default {
       data: formData
     })
   },
+  updateEntity_2019 (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/goodsaptitude/update_2019/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
   updateCodeEntity (myclassid, formData, myAxios) {
     return myAxios({
       url: '/goodsaptitude/updatecode/' + myclassid,

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

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/goodsaptitude' }">物资类项目与资质对照表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/goodsaptitude2019' }">物资类项目与资质对照表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
@@ -11,310 +11,236 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <el-button type="primary"
+                     size="mini"
+                     @click="saveEntity">保存</el-button>
           <router-link :to="'/oilsupplier/goodsaptitude2019'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+            <el-button type="primary"
+                       size="mini"
+                       style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
-      <el-form label-width="240px" ref="EntityForm" :model="formData">
-        <!-- <el-row>
+      <el-form label-width="240px"
+               ref="EntityForm"
+               :model="formData">
+        <el-row>
           <el-col :span="8">
-            <el-form-item label="编码" label-width="110px">
-              <el-input v-model="formData.Code" placeholder="请输入" style="width: 100%"></el-input>
+            <el-form-item label="编码"
+                          label-width="110px">
+              <el-input v-model="formData.Code"
+                        placeholder="请输入"
+                        style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="名称" label-width="110px">
-              <el-input v-model="formData.Name" placeholder="请输入" style="width: 100%"></el-input>
+            <el-form-item label="名称"
+                          label-width="110px">
+              <el-input v-model="formData.Name"
+                        placeholder="请输入"
+                        style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-   
-        </el-row> -->
+
+        </el-row>
         <el-row>
-          <el-col :span="6" v-for="(item,i) in dynamicTableColumns" :key="i">
+          <el-col :span="6"
+                  v-for="(item,i) in dynamicTableColumns"
+                  :key="i">
             <el-form-item :label="item.label">
-              <el-switch v-model="formData[item.prop]" active-value="1" inactive-value="0"></el-switch>
+              <el-switch v-model="formData[item.prop]"
+                         active-value="1"
+                         inactive-value="0"></el-switch>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-card>
-   
+
   </div>
 </template>
 
 <script>
-  import {
-    mapGetters
-  } from 'vuex'
-  import api from '@/api/oilsupplier/goodsaptitude'
+import {
+  mapGetters
+} from 'vuex'
+import api from '@/api/oilsupplier/goodsaptitude'
 import setapi from '@/api/oilsupplier/oilclassorgset'
-  export default {
-    computed: {
-      ...mapGetters({
-        authUser: 'authUser'
-      })
-    },
-    name: 'oilgoodsaptitudeEdit',
+export default {
+  computed: {
+    ...mapGetters({
+      authUser: 'authUser'
+    })
+  },
+  name: 'oilgoodsaptitudeEdit',
 
-    data () {
-      return {
-        goodsDialog: false,
-        serviceId: '',
-        orgtreelist: [],
-        orgtreeprops: {
-          value: 'Id',
-          label: 'CodeName',
-          children: 'children',
-          isLeaf: 'Leaf'
-        },
-        auditerName: '',
-        classid: '',
-        formData: {
-          Id: '',
-          Code: '',
-          Name: '',
-          BigClassName: '',
-          MiddleClassName: '',
-          SmallClassName: '',
-          GoodsName: '',
-          GoodsLevel: '',
-          GoodsDesc: '',
-          Standard: '',
-          CompanyType: '',
-          F01: '',
-          F02: '',
-          F03: '',
-          F04: '',
-          F05: '',
-          F06: '',
-          F07: '',
-          F08: '',
-          F09: '',
-          F10: '',
-          F11: '',
-          F12: '',
-          F13: '',
-          F14: '',
-          F15: '',
-          F16: '',
-          F17: '',
-          F18: '',
-          F19: '',
-          F20: '',
-          F21: '',
-          F22: '',
-          F23: '',
-          F24: '',
-          F25: '',
-          F26: '',
-          F27: '',
-          F28: '',
-          F29: '',
-          F30: '',
-          F31: '',
-          F32: '',
-          F33: '',
-          F34: '',
-          F35: '',
-          F36: '',
-          F37: '',
-          F38: '',
-          F39: '',
-          F40: '',
-          F41: '',
-          F42: '',
-          F43: '',
-          F44: '',
-          F45: '',
-          F46: '',
-          Remark: '',
-          DeletionStateCode: '',
-          CreateOn: '',
-          CreateUserId: '',
-          CreateBy: '',
-          ModifiedOn: '',
-          ModifiedUserId: '',
-          ModifiedBy: ''
-        },
-        dynamicTableColumns: [],
-        checkList: []
-        // 下拉选择项
-        // wellNoOptions: [],
-        // supervisersOptions: [],
+  data () {
+    return {
+      serviceId: '',
+      formData: {
+        Id: '',
+        Code: '',
+        Name: '',
+        F01: '',
+        F02: '',
+        F03: '',
+        F04: '',
+        F05: '',
+        F06: '',
+        F07: '',
+        F08: '',
+        F09: '',
+        F10: '',
+        F11: '',
+        F12: '',
+        F13: '',
+        F14: '',
+        F15: '',
+        F16: '',
+        F17: '',
+        F18: '',
+        F19: '',
+        F20: '',
+        F21: '',
+        F22: '',
+        F23: '',
+        F24: '',
+        F25: '',
+        F26: '',
+        F27: '',
+        F28: '',
+        F29: '',
+        F30: '',
+        F31: '',
+        F32: '',
+        F33: '',
+        F34: '',
+        F35: '',
+        F36: '',
+        F37: '',
+        F38: '',
+        F39: '',
+        F40: '',
+        F41: '',
+        F42: '',
+        F43: '',
+        F44: '',
+        F45: '',
+        F46: ''
+      },
+      dynamicTableColumns: []
 
+    }
+  },
+  created () {
+    this.serviceId = this.$route.params.opera
+    if (this.serviceId !== 'add' && this.serviceId > 0) {
+      this.formData.Id = this.serviceId
+      this.initDatas()
+    } else {
+      this.formData.Id = 0
+    }
+    this.initTableHeader()
+  },
+  methods: {
+    initTableHeader () {
+      setapi.initGoodTableHeader(this.$axios).then(res => {
+        this.dynamicTableColumns = res.data.items
+      })
+    },
+    initDatas () {
+      if (this.formData.Id) {
+        api.getEntity_2019(this.formData.Id, this.$axios).then(res => {
+          this.formData = res.data[0]
+          console.log(this.formData)
+        }).catch(err => {
+          console.error(err)
+        })
       }
     },
-    created () {
-      this.serviceId = this.$route.params.opera
-      this.getDictOptions()
 
-      if (this.serviceId != 'add' && this.serviceId > 0) {
-        this.formData.Id = this.serviceId
-        this.initDatas()
-      } else {
-        this.formData.Id = 0
-      }
-      this.initTableHeader()
-  },
-    methods: {
-      initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
-          this.dynamicTableColumns = res.data.items
-        })
-      },
-      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])
+    // 保存信息
+    saveEntity () {
+      this.$refs['EntityForm'].validate((valid) => {
+        if (valid) {
+          if (this.formData.Id === 0) {
+            this.addEntity()
+          } else {
+            this.updateEntity()
           }
+        } else {
+          return false
         }
-        if (this.checkList.length > 1) {
+      })
+    },
+
+    addEntity () {
+      api.addEntity_2019(this.formData, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          this.formData.Id = res.data.item
+          console.log(res)
+          this.initDatas()
           this.$message({
-            type: 'warning',
-            message: '只能选择一个分类！'
+            type: 'success',
+            message: res.data.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
-      },
-      // 获取下一级所有分类
-      getChildrens (val, resolve) {
-        let Id = 0
-        if (val.level === 0) {
-          Id = 0
         } else {
-          Id = val.data.Id
-        }
-        this.$axios.get('goodsaptitude/goodschildlistbypid/' + Id, {})
-          .then(res => {
-            if (!res.data.items || res.data.items.length <= 0) {
-              val.isLeaf = true
-              return resolve([])
-            }
-            for (let idx in res.data.items) {
-              res.data.items[idx].Leaf = res.data.items[idx].Leaf === '1'
-            }
-            return resolve(res.data.items)
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-      filterNode (value, data) {
-        if (!value) return true
-        return data.CodeName.indexOf(value) !== -1
-      },
-      initDatas () {
-        if (this.formData.Id) {
-          api.getEntity(this.formData.Id, this.$axios).then(res => {
-            console.log(this.formData)
-            this.formData = res.data
-          }).catch(err => {
-            console.error(err)
+          this.$message({
+            type: 'warning',
+            message: res.data.message
           })
         }
-      },
-
-      getDictOptions () {
-        api.getDictList(this.$axios).then(res => {
-          // this.wellNoOptions = res.data.items['WellNo']
-          // this.supervisersOptions = res.data.items['Supervisers']
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
-      // 保存信息
-      saveEntity () {
-        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
-          }
-        })
-      },
-
-      addEntity () {
-        api.addEntity(this.classid, this.formData, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            // 保存成功后，初始化数据，变成修改
-            this.formData.Id = res.data.item
-            this.initDatas()
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
-      updateEntity () {
-        api.updateEntity(this.formData.Id, this.formData, 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)
-        })
-      },
+      }).catch(err => {
+        console.error(err)
+      })
+    },
 
-      jstimehandle (val) {
-        if (val === '') {
-          return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
-          return '----'
-        } else if (val === '5000-01-01T23:59:59+08:00') {
-          return '永久'
+    updateEntity () {
+      this.formData.Id = parseInt(this.formData.Id)
+      this.formData.ClassId = parseInt(this.formData.ClassId)
+      api.updateEntity_2019(this.formData.Id, this.formData, this.$axios).then(res => {
+        if (res.data.code === 0) {
+          // 保存成功后，初始化数据，变成修改
+          this.initDatas()
+          this.$message({
+            type: 'success',
+            message: res.data.message
+          })
         } else {
-          val = val.replace('T', ' ')
-          return val.substring(0, 10)
+          this.$message({
+            type: 'warning',
+            message: res.data.message
+          })
         }
-      },
+      }).catch(err => {
+        console.error(err)
+      })
+    },
 
-      formatDateTime (date) {
-        var y = date.getFullYear()
-        var m = date.getMonth() + 1
-        m = m < 10 ? ('0' + m) : m
-        var d = date.getDate()
-        d = d < 10 ? ('0' + d) : d
-        var h = date.getHours()
-        var minute = date.getMinutes()
-        minute = minute < 10 ? ('0' + minute) : minute
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+    jstimehandle (val) {
+      if (val === '') {
+        return '----'
+      } else if (val === '0001-01-01T08:00:00+08:00') {
+        return '----'
+      } else if (val === '5000-01-01T23:59:59+08:00') {
+        return '永久'
+      } else {
+        val = val.replace('T', ' ')
+        return val.substring(0, 10)
       }
+    },
+
+    formatDateTime (date) {
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      var h = date.getHours()
+      var minute = date.getMinutes()
+      minute = minute < 10 ? ('0' + minute) : minute
+      return y + '-' + m + '-' + d + ' ' + h + ':' + minute
     }
   }
+}
 </script>

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

@@ -39,11 +39,11 @@
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <!-- <router-link :to="'/oilsupplier/goodsaptitude/add/operation'">
+            <router-link :to="'/oilsupplier/goodsaptitude2019/add/operation'">
               <el-button type="primary"
                          size="mini"
                          style="margin-left:10px; margin-top: -4px;">添加</el-button>
-            </router-link> -->
+            </router-link>
             <el-button type="primary"
                        size="mini"
                        style="margin-left:10px; margin-top: -4px;"