添加是否为制造商

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertsub/oilsuppliercertsub.go

@@ -9,6 +9,7 @@ type OilSupplierCertSub struct {
 	SupplierId           int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
 	SupplierCertId       int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
 	SupplierCertAppendId int       `xorm:"not null comment('增项信息表ID') INT(10)"`
+	IsManufacturer		 int	   `xorm:"not null comment('是否为供应商') INT(11)"`
 	SupplierTypeCode     string    `xorm:"not null default '' comment('准入类别代码') VARCHAR(5)"`
 	SubClassId           int       `xorm:"not null comment('分类表主键（物资类或基建类或技术服务类）') INT(10)"`
 	Code                 string    `xorm:"not null default '' comment('分类编码') VARCHAR(8)"`

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

@@ -936,6 +936,34 @@ func (this *OilSupplierCertSubController) UpdateStatus() {
 	}
 }
 
+// @Title 修改是否为供应商
+// @Description
+// @router /updatemanufacturer/:Id/:IsManufacturer [get]
+func (this *OilSupplierCertSubController) UpdateManufacturer() {
+	Id := this.Ctx.Input.Param(":Id")
+	IsManufacturer := this.Ctx.Input.Param(":IsManufacturer")
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	var error error
+	if IsManufacturer == "2" {
+		_, error = svc.DBE.Exec("update " + OilSupplierCertSubName + " set IsManufacturer =1 where Id=" + Id + "")
+	} else if IsManufacturer == "1"{
+		_, error = svc.DBE.Exec("update " + OilSupplierCertSubName + " set IsManufacturer=2 where Id=" + Id + "")
+	}
+
+	var errinfo ErrorDataInfo
+	if error == nil {
+		errinfo.Message = "修改成功！"
+		errinfo.Code = 0
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "修改失败！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}
+
 type OilSupplierCert2File struct {
 	Id            int    `json:"not null pk autoincr INT(10)"`
 	certSubId     int    `json:"not null default 0 comment('供方基本信息表主键') INT(10)"`

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

@@ -34,6 +34,14 @@
         <!--</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
+                  label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">
+                  <template slot-scope="scope">
+                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                    <span v-else>——</span>
+                  </template>
+        </el-table-column>
          <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
             <span v-if="scope.row.CertSubStatus=='1'"

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

@@ -13,6 +13,14 @@
         <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
+                  label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">
+                  <template slot-scope="scope">
+                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                    <span v-else>——</span>
+                  </template>
+        </el-table-column>
          <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
             <span v-if="scope.row.CertSubStatus=='1'"

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

@@ -30,6 +30,13 @@
         <el-table-column prop="Name"
                          label="分类名称"
                          show-overflow-tooltip></el-table-column>
+        <el-table-column
+                  label="是否为制造商" width="100">
+                  <template slot-scope="scope">
+                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)">非制造商</el-tag>
+                    <el-tag type="success" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)">制造商</el-tag>
+                  </template>
+        </el-table-column>
         <el-table-column prop="CertSubStatus"
                          label="状态"
                          show-overflow-tooltip>
@@ -313,6 +320,39 @@ export default {
           console.error(err)
         })
     },
+    type_change(val,canadd,newcanadd){
+      if (canadd == true || newcanadd == true) {
+      if (val.row.IsManufacturer == 2){
+        let IsManufacturer = 2
+        this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) + '/' + IsManufacturer + '', {}).then(res => {
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '更改成功'
+              })
+              this.initData()
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+        }else if (val.row.IsManufacturer == 1){//---------------转换供应商与非供应商
+        let IsManufacturer = 1
+        this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) + '/' + IsManufacturer + '', {}).then(res => {
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '更改成功'
+              })
+              this.initData()
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+        }
+      }
+    },
     changeCertSubStatus (row, column, cell, event) {
       if (this.newcanadd && column.property === 'CertSubStatus') {
         this.$confirm('确定更改此准入范围状态吗?', '提示', {
@@ -402,6 +442,7 @@ export default {
         SupplierTypeCode: '01',
         Type: '1',
         CertSubStatus: '-1',
+        IsManufacturer: 2,
         Remark: this.Remark1,
         CheckList: this.sectionCert
       }
@@ -441,6 +482,7 @@ export default {
         SupplierCertId: parseInt(_this.SupplierCertId),
         SupplierTypeCode: '01',
         Type: '1',
+        IsManufacturer: 2,
         CertSubStatus: '-1',
         Remark: _this.Remark
       }
@@ -607,4 +649,8 @@ export default {
 </script>
 
 <style>
+  .el-pagination {
+    margin: 1rem 0 2rem;
+    text-align: right;
+  }
 </style>

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

@@ -16,6 +16,14 @@
         <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
+                  label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">
+                  <template slot-scope="scope">
+                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                    <span v-else>——</span>
+                  </template>
+        </el-table-column>
         <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
             <span v-if="scope.row.CertSubStatus=='1'"

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

@@ -62,6 +62,14 @@
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></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
+                          label="是否为制造商" width="100">
+                          <template slot-scope="scope">
+                            <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                            <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                            <span v-else>——</span>
+                          </template>
+                </el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
         </el-card>

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

@@ -89,6 +89,14 @@
                 <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></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
+                          label="是否为制造商" width="100">
+                          <template slot-scope="scope">
+                            <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                            <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                            <span v-else>——</span>
+                          </template>
+                </el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
               </el-table>
               <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -117,6 +125,14 @@
                 </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
+                          label="是否为制造商" width="100">
+                          <template slot-scope="scope">
+                            <el-tag type="info" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope)">非制造商</el-tag>
+                            <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1" @click="type_change(scope)">制造商</el-tag>
+                            <span v-else>——</span>
+                          </template>
+                </el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
               </el-table>
               <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -950,6 +966,40 @@
         this.dialogFormData.SortFlag = sortFlagStr
         this.getCodeById(item[item.length - 1]) // 根据分类Id获取Code
       },
+      type_change(val){
+        console.log(this.formData.Status,"asdasddds")
+      if (this.formData.Status <= 0 && this.formData.Status != -5) {
+      if (val.row.IsManufacturer == 2){
+        let IsManufacturer = 2
+        this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) + '/' + IsManufacturer + '', {}).then(res => {
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '更改成功'
+              })
+              this.getMySortList()
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+        }else if (val.row.IsManufacturer == 1){//---------------转换供应商与非供应商
+        let IsManufacturer = 1
+        this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.row.Id) + '/' + IsManufacturer + '', {}).then(res => {
+            if (res.data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '更改成功'
+              })
+              this.getMySortList()
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+        }
+      }
+    },
 
       commitaudit () {
         this.AuditdialogShow = true
@@ -1342,6 +1392,7 @@
         // 访问接口
         api.getMyList(params, this.$axios).then(res => {
           this.myentityList = res.data.item
+          console.log(this.myentityList,"uwuwuwuwuwuwuwu")
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -1498,6 +1549,7 @@
           SupplierCertId: parseInt(this.formData.SupplierCertId),
           SupplierCertAppendId: parseInt(this.dialogFormData.SupplierCertAppendId),
           SupplierTypeCode: '01',
+          IsManufacturer: 2,
           Remark: this.dialogFormData.Remark,
           Type: '2'
         }
@@ -1789,6 +1841,7 @@
           SupplierCertAppendId: parseInt(this.dialogFormData.SupplierCertAppendId),
           SupplierTypeCode: '01',
           Type: '2',
+          IsManufacturer: 2,
           Remark: this.Remark1,
           CheckList: this.sectionCert
         }

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

@@ -742,6 +742,14 @@
             <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
+                        label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">
+                        <template slot-scope="scope">
+                          <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                          <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                          <span v-else>——</span>
+                        </template>
+              </el-table-column>
               <el-table-column label="状态"
                                align="center"
                                width="100px">

src/dashoo.cn/frontend_web/src/pages/select/zrfwselect/goodslist.vue

@@ -18,6 +18,14 @@
             <span v-else>——</span>
           </template>
         </el-table-column>
+        <el-table-column
+                  label="是否为制造商" width="100">
+                  <template slot-scope="scope">
+                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
+                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
+                    <span v-else>——</span>
+                  </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"