添加增项申请的公司下拉选项

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -25,3 +25,9 @@ type OilSupplierCertAppend struct {
 	ModifiedUserId int       `xorm:"INT(10)"`
 	ModifiedBy     string    `xorm:"VARCHAR(50)"`
 }
+
+type Supplier struct {
+	SupplierId     int
+	SupplierCertId int
+	SupplierName   string
+}

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

@@ -2,6 +2,7 @@ package oilsupplier
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 	"time"
 
@@ -111,6 +112,25 @@ func (this *OilSupplierCertAppendController) GetEntityById() {
 	this.ServeJSON()
 }
 
+// @Title 获取公司信息
+// @Description 根据创建用户Id和增项类别号获取公司信息
+// @Success 200 {object} []suppliercertappend.OilSupplierCertAppend
+// @router /getsupplier/:id [get]
+func (this *OilSupplierCertAppendController) GetSupplier() {
+	Id := this.Ctx.Input.Param(":id")
+
+	svc := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
+	sqlStr := "SELECT b.Id AS SupplierId, a.Id AS SupplierCertId, b.SupplierName AS SupplierName FROM OilSupplierCert AS a LEFT JOIN OilSupplier AS b ON a.SupplierId = b.Id "
+	where := "WHERE a.SupplierTypeCode = " + Id + " AND  a.CreateUserId = " + this.User.Id
+
+	sqlStr = sqlStr + where
+
+	model, _ := svc.DBE.QueryString(sqlStr)
+
+	this.Data["json"] = &model
+	this.ServeJSON()
+}
+
 // @Title 添加
 // @Description 添加增项信息
 // @Success	200	{object} controllers.Request

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -24,13 +24,25 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
                   <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位">
+                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
+                    <el-option
+                      v-for="item in supplierList"
+                      :key="item.SupplierId"
+                      :label="item.SupplierName"
+                      :value="item.SupplierId">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <!-- <el-col :span="12">
                 <el-form-item label="推荐单位编码" prop="RecUnitId">
                   <el-input v-model="formData.RecUnitId" placeholder="请输入推荐单位编码"></el-input>
@@ -130,7 +142,16 @@
           callback()
         }
       }
+      var CheckSelectedOption3 = (rule, value, callback) => {
+        if (this.supplierOptions === '') {
+          callback(new Error('请选择供应方公司'))
+        } else {
+          callback()
+        }
+      }
       return {
+        supplierList: [], //供应方公司列表
+        supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
         optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
@@ -195,6 +216,11 @@
             validator: CheckSelectedOption,
             trigger: 'blur'
           }],
+          checkSelectedSupplier: [{
+            required: true,
+            validator: CheckSelectedOption3,
+            trigger: 'blur'
+          }],
         },
         //增项分类表单规则
         sortEntityFormRules: {
@@ -219,6 +245,7 @@
       }
       this.getOrgTreeList() //获取推荐单位层级列表
       this.getTechTreeList() //获取技术服务类层级列表
+      this.getSupplierList() //获取供应方公司列表
     },
     methods: {
 
@@ -239,6 +266,18 @@
           })
       },
 
+      //获取供应方公司列表
+      getSupplierList() {
+        let _this = this
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '2', {})
+          .then(res => {
+            _this.supplierList = res.data
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //获取技术服务类层级列表
       getTechTreeList() {
         let _this = this
@@ -251,6 +290,16 @@
           })
       },
 
+      //获取SupplierId和SupplierCertId
+      getInfo(vId) {//这个vId也就是value值
+        let obj = {}
+        obj = this.supplierList.find((item)=>{
+          return item.SupplierId === vId;//筛选出匹配数据
+        })
+        this.formData.SupplierId = parseInt(obj.SupplierId)
+        this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
+      },
+
       //获取分类级联Id
       getCode(item) {
         let sortFlagStr = item.toString()
@@ -290,6 +339,8 @@
             }
             _this.selectedOrgList = arr2
           }
+          //显示公司名
+          _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -24,13 +24,25 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
                   <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位">
+                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
+                    <el-option
+                      v-for="item in supplierList"
+                      :key="item.SupplierId"
+                      :label="item.SupplierName"
+                      :value="item.SupplierId">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <!-- <el-col :span="12">
                 <el-form-item label="推荐单位编码" prop="RecUnitId">
                   <el-input v-model="formData.RecUnitId" placeholder="请输入推荐单位编码"></el-input>
@@ -130,7 +142,16 @@
           callback()
         }
       }
+      var CheckSelectedOption3 = (rule, value, callback) => {
+        if (this.supplierOptions === '') {
+          callback(new Error('请选择供应方公司'))
+        } else {
+          callback()
+        }
+      }
       return {
+        supplierList: [], //供应方公司列表
+        supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
         optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
@@ -195,6 +216,11 @@
             validator: CheckSelectedOption,
             trigger: 'blur'
           }],
+          checkSelectedSupplier: [{
+            required: true,
+            validator: CheckSelectedOption3,
+            trigger: 'blur'
+          }],
         },
         //增项分类表单规则
         sortEntityFormRules: {
@@ -219,6 +245,7 @@
       }
       this.getOrgTreeList() //获取推荐单位层级列表
       this.getTechTreeList() //获取技术服务类层级列表
+      this.getSupplierList() //获取供应方公司列表
     },
     methods: {
 
@@ -239,6 +266,18 @@
           })
       },
 
+      //获取供应方公司列表
+      getSupplierList() {
+        let _this = this
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '1', {})
+          .then(res => {
+            _this.supplierList = res.data
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //获取技术服务类层级列表
       getTechTreeList() {
         let _this = this
@@ -251,6 +290,16 @@
           })
       },
 
+      //获取SupplierId和SupplierCertId
+      getInfo(vId) {//这个vId也就是value值
+        let obj = {}
+        obj = this.supplierList.find((item)=>{
+          return item.SupplierId === vId;//筛选出匹配数据
+        })
+        this.formData.SupplierId = parseInt(obj.SupplierId)
+        this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
+      },
+
       //获取分类级联Id
       getCode(item) {
         let sortFlagStr = item.toString()
@@ -290,6 +339,8 @@
             }
             _this.selectedOrgList = arr2
           }
+          //显示公司名
+          _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
           console.error(err)
         })

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -24,13 +24,25 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
-              <el-col :span="24">
+              <el-col :span="12">
                 <el-form-item label="推荐单位名称" prop="checkSelectedRecUnitName">
                   <el-cascader ref="tjdwCascader" :options="organizeTreeList" :props="organizeTreeProps" change-on-select :show-all-levels="false" 
-                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位">
+                                v-model="selectedOrgList" @change="getCode2" placeholder="请选择推荐单位" style="width: 100%">
                   </el-cascader>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
+                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司" style="width: 100%">
+                    <el-option
+                      v-for="item in supplierList"
+                      :key="item.SupplierId"
+                      :label="item.SupplierName"
+                      :value="item.SupplierId">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <!-- <el-col :span="12">
                 <el-form-item label="推荐单位编码" prop="RecUnitId">
                   <el-input v-model="formData.RecUnitId" placeholder="请输入推荐单位编码"></el-input>
@@ -130,7 +142,16 @@
           callback()
         }
       }
+      var CheckSelectedOption3 = (rule, value, callback) => {
+        if (this.supplierOptions === '') {
+          callback(new Error('请选择供应方公司'))
+        } else {
+          callback()
+        }
+      }
       return {
+        supplierList: [], //供应方公司列表
+        supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
         optionsList: [], //增项分类层级列表
         selectedOptList: [], //已选择的增项分类列表
@@ -195,6 +216,11 @@
             validator: CheckSelectedOption,
             trigger: 'blur'
           }],
+          checkSelectedSupplier: [{
+            required: true,
+            validator: CheckSelectedOption3,
+            trigger: 'blur'
+          }],
         },
         //增项分类表单规则
         sortEntityFormRules: {
@@ -219,6 +245,7 @@
       }
       this.getOrgTreeList() //获取推荐单位层级列表
       this.getTechTreeList() //获取技术服务类层级列表
+      this.getSupplierList() //获取供应方公司列表
     },
     methods: {
 
@@ -239,6 +266,18 @@
           })
       },
 
+      //获取供应方公司列表
+      getSupplierList() {
+        let _this = this
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '3', {})
+          .then(res => {
+            _this.supplierList = res.data
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+
       //获取技术服务类层级列表
       getTechTreeList() {
         let _this = this
@@ -251,6 +290,16 @@
           })
       },
 
+      //获取SupplierId和SupplierCertId
+      getInfo(vId) {//这个vId也就是value值
+        let obj = {}
+        obj = this.supplierList.find((item)=>{
+          return item.SupplierId === vId;//筛选出匹配数据
+        })
+        this.formData.SupplierId = parseInt(obj.SupplierId)
+        this.formData.SupplierCertId = parseInt(obj.SupplierCertId)
+      },
+
       //获取分类级联Id
       getCode(item) {
         let sortFlagStr = item.toString()
@@ -290,6 +339,8 @@
             }
             _this.selectedOrgList = arr2
           }
+          //显示公司名
+          _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {
           console.error(err)
         })