一级二级供应商选择

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

@@ -999,10 +999,11 @@ func (this *OilGoodsAptitudeController) GoodsChildList() {
 // @router /goodschildlistbypid/:parentid [get]
 func (this *OilGoodsAptitudeController) GoodsChildLisByParentId() {
 	ParentId := this.Ctx.Input.Param(":parentid")
+	GoodsLevel := this.GetString("GoodsLevel")
 	sqlStr := "SELECT o.Id, o.`Code`, o.`Name`, concat(o.Code, '  ', o.Name) as CodeName, o.ParentId, g.GoodsLevel," +
 		" (CASE WHEN length(Code)>=8 THEN '1' ELSE '0' END) as Leaf FROM OilGoodsAptitudeClass o " +
 		" LEFT JOIN `OilGoodsAptitude` g ON (g.ClassId = o.Id)" +
-		" WHERE o.ParentId = '" + ParentId + "' AND o.Edition='1' AND o.DeletionStateCode = 0 order by o.Code"
+		" WHERE IF ((LENGTH(CODE)=8 and '" + GoodsLevel + "' = 2 ) , g.GoodsLevel = '2', 1=1 ) and o.ParentId = " + ParentId + " AND o.Edition='1' AND o.DeletionStateCode = 0 order by o.Code"
 
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -168,7 +168,7 @@ module.exports = {
     // 'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
     'pages/oilsupplier/infochangech/*.*',
-    'pages/oilsupplier/supplier/*.*',
+    // 'pages/oilsupplier/supplier/*.*',
     'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -139,7 +139,7 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="级别">
+          <el-form-item label="级别" prop="Grade">
             <el-select v-model="formData.Grade"
                        placeholder="请选择级别"
                        :disabled="this.formData.Status > '0'&&!appendStatus"
@@ -887,7 +887,11 @@ export default {
           validator: checkMobile,
           trigger: 'change'
         }],
-
+        Grade: [{
+          required: true,
+          message: '请选择级别',
+          trigger: 'blur'
+        }],
         Telphone: [{
           required: true,
           validator: checkTelphone,

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -256,6 +256,10 @@ export default {
     candelete: {
       type: Boolean,
       default: false
+    },
+    Grade: {
+      type: String,
+      default: ''
     }
   },
   created () {
@@ -622,7 +626,10 @@ export default {
       } else {
         Id = val.data.Id
       }
-      this.$axios.get('goodsaptitude/goodschildlistbypid/' + Id, {})
+      let params = {
+        GoodsLevel: this.Grade
+      }
+      this.$axios.get('goodsaptitude/goodschildlistbypid/' + Id, {params})
         .then(res => {
           if (!res.data.items || res.data.items.length <= 0) {
             val.isLeaf = true

src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue

@@ -12,10 +12,16 @@
           提交
         </el-button> -->
       </div>
-      <el-table :data="businessList" size="mini" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange"> 
+      <el-table :data="businessList" size="mini" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
         <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="GoodsLevel" label="级别" width="80px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.GoodsLevel=='1'">一级</span>
+            <span v-if="scope.row.GoodsLevel=='2'">二级</span>
+          </template>
+        </el-table-column>
         <el-table-column
                   label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">
                   <template slot-scope="scope">
@@ -178,6 +184,10 @@
       },
       flag: {
         type: String
+      },
+      Grade: {
+        type: String,
+        default: ''
       }
     },
     computed: {
@@ -309,7 +319,6 @@
           params
         })
           .then(res => {
-            console.log(res)
             _this.businessList = res.data.items
             _this.currentItem_Count = res.data.currentItemCount
           })
@@ -431,6 +440,17 @@
       },
       nextStep () {
         if (this.businessList && this.businessList.length > 0) {
+          if (this.Grade === '2') {
+            for (let idx in this.businessList) {
+              if (this.businessList[idx].GoodsLevel === '1') {
+                this.$message({
+                  type: 'warning',
+                  message: '二级供应商不能准入一级物资！'
+                })
+                return
+              }
+            }
+          }
           if (this.subfileList && this.subfileList.length > 0) {
             for (var i = 0; i < this.subfileList.length; i++) {
               if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -311,6 +311,7 @@
                       :canadd="add_flat"
                       :candelete="delete_flat"
                       :operType="formData.OperType"
+                      :Grade="formData.Grade"
                       height="360px"
                       style="margin-top: 20px"></goods-list>
         </el-tab-pane>
@@ -320,6 +321,7 @@
                         :data.sync="subfileList"
                         :canadd="add_flat"
                         :flag="flag"
+                        :Grade="formData.Grade"
                         @close="selectAuditOrg"></subfile-list>
         </el-tab-pane>