Sfoglia il codice sorgente

注册--增项添加bug

lining 6 anni fa
parent
commit
deb98f55e6

+ 4 - 1
src/dashoo.cn/backend/api/controllers/register/oilcorporateinfo.go

@@ -451,7 +451,10 @@ func (this *OilCorporateInfoController) ComAudit() {
 		if receiveVal == "true" {
 			upmodel.Remark = Remark
 			upmodel.CheckStatus = -1 //未通过审核
-			cols := []string{"Remark", "CheckStatus"}
+			upmodel.ModifiedOn = time.Now()
+			upmodel.ModifiedBy = this.User.Realname
+			upmodel.ModifiedUserId, _ = strconv.Atoi(this.User.Id)
+			cols := []string{"Remark", "CheckStatus", "ModifiedOn", "ModifiedBy", "ModifiedUserId"}
 			err = svc.UpdateEntityBytbl(OilCorporateInfoName, model.Id, &upmodel, cols)
 
 			//编辑短信内容

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/oilsupplier/companyaudit/index.vue

@@ -94,9 +94,9 @@
                              header-align="center"
                              show-overflow-tooltip>
               <template slot-scope="scope">
-                <span v-if="scope.row.CheckStatus == 0"
-                      style="color:#E6A23C">待审核</span>
                 <span v-if="scope.row.CheckStatus == 1"
+                      style="color:#E6A23C">待审核</span>
+                <span v-if="scope.row.CheckStatus == 11"
                       style="color:#67C23A">审核通过</span>
                 <span v-if="scope.row.CheckStatus == -1"
                       style="color:#F56C6C">审核未通过</span>

+ 2 - 3
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -280,6 +280,7 @@
             </el-row>
             <el-row :gutter="20" style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
               <el-col :span="20">
+                {{switchstatus}}
                 <el-tree v-show="!switchstatus" highlight-current :expand-on-click-node="true" node-key="CodeName"
                          :data="orgtreelist" :props="orgtreeprops" ref="orgmanagetree" check-on-click-node show-checkbox lazy
                          :load="getChildrens" :filter-node-method="filterNode">
@@ -784,7 +785,7 @@
       }
       this.getSupplierList() // 获取供应方公司列表
       this.getDictOptions()
-      this.getorgtreelist()
+      // this.getorgtreelist()
       this.orgtreeChange(this.majorDept)
       this.initTableHeader()
       this.initData2019()
@@ -967,7 +968,6 @@
         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
@@ -1392,7 +1392,6 @@
         // 访问接口
         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)