增项页面修改

src/dashoo.cn/backend/api/conf/app.conf

@@ -19,7 +19,7 @@ orderurl=http://uid.labsop.cn:8182/worker/2
 type=mysql
 
 #本地测试服务器
-name=supplier_system
+name=supplier_system_248_4
 host=47.92.212.59
 user=root
 pwd=zks123456

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

@@ -55,7 +55,7 @@ func (this *AnnualAuditController) GetEntityList() {
 
 	//获取分页信息
 	page := this.GetPageInfoForm()
-	where := " 1=1 "
+	where := " b.Id is not null "
 	orderby := "b.Id"
 	asc := false
 	Order := this.GetString("Order")

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

@@ -120,7 +120,7 @@ func (this *InfoChangeController) GetSuppList() {
 
 	//获取分页信息
 	page := this.GetPageInfoForm()
-	where := " 1=1 "
+	where := " b.Id is not null "
 	orderby := "b.Id"
 	asc := false
 	Order := this.GetString("Order")

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

@@ -48,7 +48,7 @@ func (this *OilSupplierCertAppendController) GetList() {
 
 	//获取分页信息
 	page := this.GetPageInfoForm()
-	where := " 1=1 "
+	where := " b.Id is not null "
 	orderby := "b.Id"
 	asc := false
 	Order := this.GetString("Order")

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

@@ -2,8 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/addtionaudit/techlist' }">基建类列表</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item>基建类-增项审核</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header">
@@ -25,9 +24,9 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'&& this.formData.Status != '10'">{{auditTitle}}</el-button>
-            <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="this.formData.Status == '10'">分办</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px;"  onclick="window.history.go(-1)">返回</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px;" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
       <div>
@@ -102,12 +101,13 @@
         </el-form-item>
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2" @change="radioChange">退回</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -119,13 +119,17 @@
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2" @change="radioChange">退回</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
         </el-form-item>
+        <!-- <el-form-item label="意见">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        </el-form-item> -->
         <!-- <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
@@ -200,7 +204,7 @@
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
       :visible="chooseAuditorVisible"></choose-auditor>
- <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
       <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
@@ -253,7 +257,8 @@
         }
       }
       return {
-        chooseAuditorVisible:false,
+        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
+        chooseAuditorVisible: false,
         audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
@@ -302,7 +307,8 @@
         entrydetail: {
           process: "",
           business: "",
-          instance: ""
+          instance: "",
+          Status: ""
         },
         dialogVisible: false, //增项分办
         dialogTitle: '',
@@ -382,6 +388,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = this.formData.BusinessKey
           this.entrydetail.instance = this.formData.WorkFlowId;
+          this.entrydetail.status = this.formData.Status
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -418,13 +425,28 @@
         })
       },
 
+      radioChange() {
+        if (this.shenheForm.SuccessStatus === 1) {
+          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+        } else {
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
+        }
+      },
+
       //获取供应方公司列表
       getSupplierList() {
         let _this = this
         let params = {
           SuppTypeCode: '02',
         }
-        _this.$axios.get('/suppliercertappend/getsupplier', {params})
+        _this.$axios.get('/suppliercertappend/getsupplier', {
+            params
+          })
           .then(res => {
             _this.supplierList = res.data
           })
@@ -449,7 +471,6 @@
         //访问接口
         api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
-          console.log("------res.entityList==--", this.entityList)
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -484,7 +505,6 @@
           })
           .then(res => {
             _this.subfileList = res.data.items
-            console.log("---this.subfileList---", this.subfileList)
             _this.currentItemCount = res.data.currentItemCount
             for (let idx in _this.subfileList) {
               console.log(_this.subfileList[idx])
@@ -591,14 +611,32 @@
       makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' && this.formData.Status !== '4' &&
-            this.formData.Status !== '5'&& this.formData.Status !== '10') {
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
+            this.formData.Status !== '4' &&
+            this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },
@@ -611,7 +649,6 @@
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.majorDept[this.majorDept.length - 1],
         }
-        console.log("---params",params)
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()

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

@@ -2,8 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/addtionaudit/techlist' }">准入审核列表</el-breadcrumb-item>
-      <el-breadcrumb-item>物资-准入审核</el-breadcrumb-item>
+      <el-breadcrumb-item>物资类-增项审核</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header">
@@ -108,12 +107,13 @@
         </el-form-item>
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2" @change="radioChange">退回</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -125,12 +125,13 @@
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1"  @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2"  @change="radioChange">退回</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
         </el-form-item>
         <!-- <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
@@ -260,6 +261,7 @@
         }
       }
       return {
+        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible:false,
         audithistoryshow: false,
         auditerOptions: [], // 审核人员
@@ -287,7 +289,8 @@
         entrydetail: {
           process: "",
           business: "",
-          instance: ""
+          instance: "",
+          status: ''
         },
         auditBtn: false,
         auditstepcode: '',
@@ -389,6 +392,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = this.formData.BusinessKey
           this.entrydetail.instance = this.formData.WorkFlowId;
+          this.entrydetail.status = this.formData.Status
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -439,6 +443,19 @@
             console.error(err)
           })
       },
+
+      radioChange () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+        } else {
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
+        }
+      },
        //获取资质文件
       getFileList() {
         this.SupplierId = this.formData.SupplierId
@@ -450,13 +467,11 @@
           _currentPage: 1,
           _size: 1000,
         }
-        console.log("------param",params)
         _this.$axios.get('supplierfile/filelistappend', {
             params
           })
           .then(res => {
             _this.subfileList = res.data.items
-            console.log("---this.subfileList---",this.subfileList)
             _this.currentItemCount = res.data.currentItemCount
             for (let idx in _this.subfileList) {
               console.log(_this.subfileList[idx])
@@ -484,11 +499,9 @@
           SupCertId: this.formData.SupplierCertId,
           SupTypeCode: "01",
         };
-        console.log("----param",params)
         //访问接口
         api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
-          console.log("------res.entityList==--", this.entityList)
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -600,14 +613,32 @@
       makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1'&& this.formData.Status !== '2' && this.formData.Status !== '4' &&
-            this.formData.Status !== '5'&& this.formData.Status !== '10') {
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
+            this.formData.Status !== '4' &&
+            this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },
@@ -620,7 +651,6 @@
           SecondAudit: this.fushenauditer,
           ThirdAudit: this.majorDept[this.majorDept.length - 1],
         }
-        console.log("---params",params)
         api2.auditEntityFir(this.formData.Id, params, this.shenheForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.getEntityById()

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

@@ -2,8 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/supplierappend/techlist' }">技术服务类列表</el-breadcrumb-item>
-      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+      <el-breadcrumb-item>技术服务类-增项审核</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header">
@@ -105,12 +104,13 @@
         </el-form-item>
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2" @change="radioChange">退回</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
@@ -122,12 +122,13 @@
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
         <el-form-item label="审核状态">
           <template>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1">通过</el-radio>
-            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2">未通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
+            <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="2" @change="radioChange">退回</el-radio>
           </template>
         </el-form-item>
-        <el-form-item label="意见">
-          <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
+        <el-form-item label="意见" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]">
+          <el-input type="textarea" v-model="shenheForm.AuditorRemark" :placeholder="textplaceholder">
+          </el-input>
         </el-form-item>
         <!-- <el-form-item :label="aduitlabel"
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
@@ -254,6 +255,7 @@
         }
       }
       return {
+        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
         chooseAuditorVisible:false,
         subfileList: [],
         audithistoryshow: false,
@@ -304,7 +306,8 @@
         entrydetail: {
           process: "",
           business: "",
-          instance: ""
+          instance: "",
+          Status: ""
         },
         organizeform: {
           IsInnerOrganize: 1,
@@ -405,6 +408,7 @@
           this.entrydetail.process = this.formData.ProcessKey
           this.entrydetail.business = this.formData.BusinessKey
           this.entrydetail.instance = this.formData.WorkFlowId;
+          this.entrydetail.status = this.formData.Status
           if (_this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -455,6 +459,19 @@
             console.error(err)
           })
       },
+
+      radioChange () {
+        if (this.shenheForm.SuccessStatus === 1) {
+          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+        } else {
+          if (this.formData.Status == '5') {
+            this.textplaceholder = ''
+          } else {
+            this.textplaceholder = '退回意见不能少于5个字'
+          }
+          this.shenheForm.AuditorRemark = ''
+        }
+      },
        //获取资质文件
       getFileList() {
         this.SupplierId = this.formData.SupplierId
@@ -471,7 +488,6 @@
           })
           .then(res => {
             _this.subfileList = res.data.items
-            console.log("---this.subfileList---",this.subfileList)
             _this.currentItemCount = res.data.currentItemCount
             for (let idx in _this.subfileList) {
               console.log(_this.subfileList[idx])
@@ -504,7 +520,6 @@
         //访问接口
         api.getListAppend(params, this.$axios).then(res => {
           this.entityList = res.data.item
-          console.log("------res.entityList==--", this.entityList)
           // this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -615,14 +630,32 @@
       makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' && this.formData.Status !== '4' &&
-            this.formData.Status !== '5'&& this.formData.Status !== '10') {
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' &&
+            this.formData.Status !== '4' &&
+            this.formData.Status !== '5' && this.formData.Status !== '10') {
             this.$message({
               type: 'warning',
               message: '请选择审核人！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '审批意见不能低于20个字符！'
+            })
+            return
+          }
+        } else {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
+            .Status !== '5' && this.formData.Status !== '10') {
+            this.$message({
+              type: 'warning',
+              message: '退回意见不能低于5个字符！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },