待办提交按钮,分办按钮

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

@@ -61,7 +61,7 @@
 
     <el-card class="box-card" style="margin-top: -20px">
       <div slot="header" class="clearfix">
-        <span>企业资质1</span>
+        <span>企业资质</span>
       </div>
       <auditfile-list ref="auditfileList" :data="auditfileList" :SupplierId="SupplierId"
         :SupplierCertId="SupplierCertId" :SupplierTypeCode="SupplierTypeCode" :businessList="auditbusList"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -15,14 +15,14 @@
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"-->
           <!--v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>-->
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commitAudit()" v-if="parseInt(this.formData.Status) === 0">提交审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == '1'">初审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == '2'">复审</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == '4'">专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick()" v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="this.formData.Status == '10'">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '10'">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="auditBtn && parseInt(this.formData.Status) === 6">交费</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="commitAudit()" v-if="parseInt(this.formData.Status) === 0">提交审批</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>
         </span>
       </div>
@@ -199,7 +199,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="审核状态1">
+        <el-form-item label="审核状态">
           <template>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="0" @change="radioChange">退回</el-radio>
@@ -217,7 +217,7 @@
     </el-dialog>
     <el-dialog :title="atitle" :visible.sync="dialogConcentrateAuditVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审核状态2">
+        <el-form-item label="审核状态">
           <template>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="0" @change="radioChange">退回</el-radio>
@@ -236,7 +236,7 @@
     </el-dialog>
     <el-dialog :title="atitle" :visible.sync="dialogCommonAuditMakeSureVisible">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审核状态3">
+        <el-form-item label="审核状态">
           <template>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="0" @change="radioChange">退回</el-radio>
@@ -250,12 +250,12 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogCommonAuditMakeSureVisible = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="loading">确 定1</el-button>
+        <el-button type="primary" size="small" @click="commonAuditMakeSure()" :loading="loading">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="审核" :visible.sync="dialogMakeSure2">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <el-form-item label="审核状态4">
+        <el-form-item label="审核状态">
           <template>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="1" @change="radioChange">通过</el-radio>
             <el-radio class="radio" v-model="shenheForm.SuccessStatus" :label="0" @change="radioChange">退回</el-radio>
@@ -292,7 +292,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="makeSure()" :loading="loading">确 定2</el-button>
+        <el-button type="primary" size="small" @click="makeSure()" :loading="loading">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="提交领导审核" :visible.sync="dialogBusinessOfficeSeparateAuditVisible">
@@ -310,7 +310,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogBusinessOfficeSeparateAuditVisible = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="businessOfficeSeparateAuditMakeSure()" :loading="loading">确 定3</el-button>
+        <el-button type="primary" size="small" @click="businessOfficeSeparateAuditMakeSure()" :loading="loading">确 定</el-button>
       </div>
     </el-dialog>
     <el-dialog title="提交初审" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
@@ -373,7 +373,49 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogSecUnitSeparateVisible = false">取 消</el-button>
-        <el-button type="primary" @click="secUnitSeparateAuditMakeSure()" :loading="loading">确2定</el-button>
+        <el-button type="primary" @click="secUnitSeparateAuditMakeSure()" :loading="loading">确定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="提交"
+               :visible.sync="dialogVisibleCom"
+               width="520px">
+      <el-form ref="searchForm"
+               label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="分办单位">
+              <el-select filterable
+                         v-model="UnitOrg"
+                         maxlength="255"
+                         clearable
+                         placeholder="请选择分办单位"
+                         style="width: 100%"
+                         @change="orgunitChange">
+                <el-option v-for="item in UnitOrgOptions"
+                           :key="item.Id"
+                           :label="item.Fullname"
+                           :value="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="auditform.AuditRemark"
+                        type="textarea"
+                        placeholder="请输入备注内容">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button size="mini"
+                   @click="dialogVisibleCom = false">取 消</el-button>
+        <el-button size="mini"
+                   type="primary"
+                   @click="companySubmitToSecUnitSeparateMakeSure" :loading="loading">确定</el-button>
       </span>
     </el-dialog>
     <choose-auditor ref="chooseAuditor" @close="setAuditer" @hideChooseAuditer="chooseAuditorVisible=false"
@@ -428,6 +470,9 @@
 
     data () {
       return {
+        dialogVisibleCom: false,
+        UnitOrgOptions: [],
+        UnitOrg: '',
         firOptions: [],
         loading: false,
         btnstatus: '',
@@ -614,6 +659,17 @@
       // this.getorgtreelistbydeptid()
     },
     methods: {
+      selectAuditOrg () {
+        if (this.selectDept) {
+          this.changeOrgUnit(this.selectDept)
+        }
+        if (this.IsCompanyUser === 0) {
+          this.getFirAuditerByDept()
+          this.dialogVisible = true
+        } else if (this.IsCompanyUser === 1) {
+          this.dialogVisibleCom = true
+        }
+      },
       radioChange () {
         if (this.formData.Status == '5') {
           if (this.shenheForm.SuccessStatus === 1) {
@@ -649,6 +705,84 @@
           }
         }
       },
+      getDictOptions () {
+        let params = {
+          status: this.formData.Status,
+          majorAduit: this.formData.ThirdAudit
+        }
+        api.getDictListByStatus(params, this.$axios).then(res => {
+          this.dictData = res.data.items
+          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
+          var selectID = res.data.items['Register'].CheckUnitId
+          var item = res.data.items['UnitOrgList'].find(n => n.Id == selectID)
+          var list = res.data.items['UnitOrgList'].filter(n => n.Id != selectID)
+          if (item != null && item != undefined) {
+            list.unshift(item)
+          }
+          this.UnitOrgOptions = list
+          // this.UnitOrgOptions = res.data.items['UnitOrgList']
+          // this.UnitOrg = res.data.items['Register'].CheckUnitId
+          this.allorgunitOptions = res.data.items['Allunitorglist']
+          this.orgunitChange(this.UnitOrg)
+          // this.auditerOptions = res.data.items['Auditer']
+          // this.organizeOption = res.data.items['Organizes']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+      commitAudit () {
+        // this.saveEntity(1)
+        // this.updateNumberEntityNoInfo()
+        apiCert.checkSupplierCertCanSubmit(this.certId, this.$axios)
+          .then(res => {
+            if (res.data.code === 0) {
+              this.selectAuditOrg()
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      companySubmitToSecUnitSeparateMakeSure () {
+        if (this.orgauditOptions == null || this.orgauditOptions.length === 0) {
+          this.$message({
+            type: 'warning',
+            message: '该单位没有分办人员！'
+          })
+          return
+        }
+        this.applyLoading = true
+        this.auditform.UnitId = this.UnitOrg
+        this.auditform.CertId = this.certId
+        this.loading = true
+        console.log('企业用户提交参数', this.auditform)
+        apiCert.companyAuditEntity(this.certId, this.auditform, this.$axios)
+          .then(res => {
+            if (res.data.code === 0) {
+              // 保存成功后，初始化数据，变成修改
+              this.initDatas()
+              this.dialogVisibleCom = false
+              this.$message({
+                type: 'success',
+                message: res.data.message
+              })
+            } else {
+              this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+            this.loading = false
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       changeOrgUnit (val) {
         let auditstepcode = 'PROF_RECE'
         api.getAuditerByDept(val, auditstepcode, this.$axios).then(res => {
@@ -778,15 +912,18 @@
         this.chooseAuditorVisible = false
         // this.auditOrgChang(this.auditer)
       },
-      auditOrgChang () {
-        let auditstepcode = 'SECOND_TRIAL'
-        api.getAuditerByFirst(this.auditer, auditstepcode, this.$axios)
-          .then(res => {
-            this.secauditerOptions = res.data.item
-          })
-          .catch(err => {
-            console.error(err)
-          })
+      orgunitChange (val) {
+        console.log('近来个啥', val)
+        if (!val) {
+          return false
+        }
+        let deptid = val
+        let auditstepcode = 'SUB_OFFICE_JS'
+        api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+          this.orgauditOptions = res.data.item
+        }).catch(err => {
+          console.error(err)
+        })
       },
       isAccess () {
         this.auditBtn = false
@@ -802,22 +939,6 @@
         })
       },
 
-      getDictOptions () {
-        let params = {
-          status: this.formData.Status,
-          majorAduit: this.formData.ThirdAudit
-        }
-        api.getDictListByStatus(params, this.$axios).then(res => {
-          this.dictData = res.data.items
-          this.orgtreelist = window.toolfun_gettreejson(res.data.items['ProOrgList'], 'id', 'pId', 'id,name')
-          this.allorgunitOptions = res.data.items['Allunitorglist']
-          // this.auditerOptions = res.data.items['Auditer']
-          // this.organizeOption = res.data.items['Organizes']
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
       getorgtreelist () {
         let _this = this
         let params = {
@@ -866,114 +987,21 @@
         })
       },
       // 保存信息
-      saveEntity (val) {
-        let valid1 = false
-        let valid2 = false
-        this.$refs['BasisInfo'].$refs['EntityForm'].validate((valid) => {
-          valid1 = valid
-        })
-
-        this.$refs['BasisInfo'].$refs['EntityFormCert'].validate((valid) => {
-          valid2 = valid
-        })
-
-        if (valid1 && valid2) {
-          if (!this.formData.SetupTime) {
-            this.formData.SetupTime = null
-          } else {
-            this.formData.SetupTime = new Date(this.formData.SetupTime)
-          }
-          // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-          this.formData.RegCapital = parseFloat(this.formData.RegCapital)
-          if (!this.formData.Id || !this.certId) {
-            if (val === 1) {
-              this.addEntityNoInfo()
-            } else {
+      saveEntity () {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            // this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + ''
+            if (!this.formData.Id) {
               this.addEntity()
-            }
-          } else {
-            if (val === 1) {
-              this.updateEntityNoInfo()
             } else {
               this.updateEntity()
             }
-          }
-          return true
-        } else {
-          return false
-        }
-      },
-      updateNumberEntityNoInfo () {
-        this.$refs['EntityFormNumber'].validate((valid) => {
-          if (valid) {
-            if (!this.CheckCompanyBase()) {
-              return false
-            }
-            this.formDataCert.InStyle = this.formData.InStyle
-            api.updateNumberEntity(this.formData.Id + '_' + this.certId, this.formDataCert, this.$axios).then(
-              res => {
-                if (res.data.code === 0) {
-                  // 保存成功后，初始化数据，变成修改
-                  this.initDatas()
-                } else {
-                  this.$message({
-                    type: 'warning',
-                    message: res.data.message
-                  })
-                }
-              }).catch(err => {
-              console.error(err)
-            })
           } else {
             return false
           }
         })
       },
-      selectAuditOrg () {
-        if (this.selectDept) {
-          this.changeOrgUnit(this.selectDept)
-        }
-        if (this.IsCompanyUser === 0) {
-          this.getFirAuditerByDept()
-          this.dialogVisible = true
-        } else if (this.IsCompanyUser === 1) {
-          this.dialogVisibleCom = true
-        }
-      },
-      commitAudit () {
-        this.saveEntity(1)
-        this.updateNumberEntityNoInfo()
-        apiCert.checkSupplierCertCanSubmit(this.certId, this.$axios)
-          .then(res => {
-            if (res.data.code === 0) {
-              this.selectAuditOrg()
-            } else {
-              this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-      updateEntityNoInfo () {
-        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            // 更新子表
-            // this.updateNumberEntity()
-            this.initDatas()
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            })
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
+
       // 保存信息
       saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -16,7 +16,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 3 && parseInt(this.formData.InStyle) !== 2">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 4 && parseInt(this.formData.InStyle) !== 2">专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 5">集中评审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="parseInt(this.formData.Status) === 10">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && parseInt(this.formData.Status) === 10">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="parseInt(this.formData.Status) === 6">交费</el-button>
           <!--<router-link>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -18,7 +18,7 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="businessOfficeSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '3'">提交专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="commonAuditClick()" v-if="auditBtn && this.formData.Status == '4'">专业审核</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="concentrateAuditClick()" v-if="auditBtn && this.formData.Status == '5'">集中评审</el-button>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="this.formData.Status == '10'">分办</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="secUnitSeparateAuditClick()" v-if="auditBtn && this.formData.Status == '10'">分办</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="paySureClick()" v-if="parseInt(this.formData.Status) === 6">交费</el-button>
           <!--<el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity" v-else>审批</el-button>-->
           <el-button type="primary" size="mini" style="margin-left: 8px" onclick="window.history.go(-1)">返回</el-button>