注册提示文案;企业资质通用;上传资质,代理商按钮禁用

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

@@ -2,9 +2,11 @@ package oilsupplier
 
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+	"dashoo.cn/backend/api/business/oilsupplier/tableheader"
 	"dashoo.cn/business2/parameter"
 	"encoding/json"
 	"strconv"
+
 	"strings"
 
 	//"strings"
@@ -163,6 +165,7 @@ func (this *SupplierfileController) FileList() {
 func (this *SupplierfileController) AddSubfile() {
 	var model supplierfile.OilSupplierFile
 	svc := supplierfile.GetSupplierfileService(utils.DBE)
+	svc1 := tableheader.GetTableHeaderService(utils.DBE)
 
 	var jsonblob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonblob, &model)
@@ -170,6 +173,9 @@ func (this *SupplierfileController) AddSubfile() {
 	model.FileName = strings.Trim(model.FileName, "$")
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	sql := "select IsManuf from `Base_TableHeader` where Name = '" + model.NeedFileType + "'"
+	var IsManuf, _ = svc1.DBE.QueryString(sql)
+	model.IsManuf = IsManuf[0]["IsManuf"]
 
 	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
 	//"营业执照,组织代码,组织机构代码证,税务登记证,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"

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

@@ -697,7 +697,7 @@
         <el-button style="float: right; padding: 3px 10px"
                    type="text"
                    @click="manufacturerdialog"
-                   :disabled="checkStatus.includes(formData.Status)"
+                   :disabled="!formData.Id  || checkStatus.includes(formData.Status)"
         >添加</el-button>
       </div>
       <manufacturer-list ref="manufacturerList"
@@ -711,8 +711,8 @@
              style="margin-top: 35px;">
       <div slot="header"
            class="clearfix">
-        <span style="padding:3px 20px">现场考察报告-</span>
-        <el-button :disabled="checkStatus.includes(formData.Status)" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
+        <span style="padding:3px 20px">现场考察报告</span>
+        <el-button :disabled="!formData.Id || checkStatus.includes(formData.Status)" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
         </el-button>
       </div>
       <el-table :data="scenefileurllist" border size="mini" empty-text="暂无数据" style="margin-top: 30px;">
@@ -895,8 +895,8 @@ export default {
     }
     // 注册资金限制
     var checkMoney = (rule, value, callback) => {
-      if (value < 0) {
-        callback(new Error('注册资金不能小于0'))
+      if (value <= 0) {
+        callback(new Error('注册资金必须大于0'))
       } else {
         callback()
       }

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

@@ -314,6 +314,7 @@
         this.initData()
       },
       initTableHeader () {
+        console.log(this.flag, 'this.flag')
         if (this.flag == '01') {
           setapi.initGoodTableHeader(this.$axios).then(res => {
             this.dynamicTableColumns = res.data.items

src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -108,7 +108,7 @@
                 </el-col>
 
                 <el-col :span="24">
-                  <el-form-item label="审核单位"  style="width: 100%">
+                  <el-form-item label="审核单位"  style="width: 100%;">
                     <el-select v-model="auditorg"  filterable placeholder="请选择审核单位"
                                ref="auditorgselect" style="width: 100%;" @change="orgChange">
                       <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
@@ -621,7 +621,12 @@
                 } else {
                   _this.isShow = true
                   _this.isLoading = false
-                  _this.$alert(response.data.message, '提示', {
+                  console.log(response.data.message, '爱妃')
+                  var message = response.data.message
+                  if (!message) {
+                    message = '工作流异常，请联系管理员！'
+                  }
+                  _this.$alert(message, '提示', {
                     confirmButtonText: '确定'
                   })
                 }