导入级别删除

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

@@ -1524,6 +1524,11 @@ func (this *OilGoodsAptitudeController) UpdataSuppierCertSub() {
 		//row := sheet.AddRow()
 		//cell := row.AddCell()
 		//cell.Value = strconv.Itoa(suppliercert.SupplierId)
+
+		var supplier supplier.OilSupplier
+		wheres := " Id=" + strconv.Itoa(suppliercert.SupplierId)
+		supsvc.GetEntity(&supplier, wheres)
+
 		log.Println(suppliercert.SupplierId)
 		var supplierCertSubList []suppliercertsub.OilSupplierCertSub
 		wheresup := "SupplierId = " + strconv.Itoa(suppliercert.SupplierId) + " and SupplierTypeCode='01' AND Type IN ('1', '3')"
@@ -1571,10 +1576,14 @@ func (this *OilGoodsAptitudeController) UpdataSuppierCertSub() {
 						whereg := "ClassId = " + strconv.Itoa(goodsaptitudeClass.Id)
 						supsvc.GetEntity(&goodsAptitude, whereg)
 						if goodsAptitude.GoodsLevel != supplierCertSub.GoodsLevel {
-							var entity suppliercertsub.OilSupplierCertSub
-							entity.GoodsLevel = goodsAptitude.GoodsLevel
-							where := "Id = " + strconv.Itoa(supplierCertSub.Id)
-							supsvc.UpdateEntityBywheretbl(OilSupplierCertSubName, &entity, colsLevel, where)
+							if goodsAptitude.GoodsLevel == "1" && supplier.Grade == "2"  {
+								supsvc.InsertEntityBytbl(TmpOilSupplierCertSubName, supplierCertSub)
+							} else {
+								var entity suppliercertsub.OilSupplierCertSub
+								entity.GoodsLevel = goodsAptitude.GoodsLevel
+								where := "Id = " + strconv.Itoa(supplierCertSub.Id)
+								supsvc.UpdateEntityBywheretbl(OilSupplierCertSubName, &entity, colsLevel, where)
+							}
 						}
 					}
 					break

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/_opera/showdelcertsub.vue

@@ -196,6 +196,12 @@
             <el-table :data="certsubList" border size="mini">
               <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">

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

@@ -332,7 +332,8 @@
           <el-table-column v-for="column in tableColumns" :prop="column.prop" sortable :width="column.width"
                            :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ transferStr(scope.row[column.prop]) }}
+              <span v-if="column.prop != 'GoodsLevel'">{{ transferStr(scope.row[column.prop]) }}</span>
+              <span v-else>{{ (scope.row[column.prop]) }}</span>
             </template>
           </el-table-column>
 
@@ -459,9 +460,6 @@
     <el-dialog title="导入失败" :visible.sync="errorDialogVisible" :close-on-click-modal = "false" width="720px">
       <el-input type="textarea" autosize placeholder="请输入内容" v-model="textarea"></el-input>
     </el-dialog>
-    <el-dialog title="删除的准入项" :visible.sync="deleteDialogVisible" :close-on-click-modal = "false" width="720px">
-
-    </el-dialog>
   </div>
 </template>
 <script>

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -750,6 +750,12 @@
             <el-table :data="certsubList" border size="mini">
               <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">