资质配置物资类，年审工作流修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -13,6 +13,9 @@
           </el-button>
           <el-button type="primary" size="mini" @click="profAudit()" v-if="AnnualStatus == 1">专业审核分配</el-button>
         </span>
+        <router-link :to="'/oilsupplier/annualaudit/annualfistaudit'">
+            <el-button type="primary" size="mini" style="margin-left: 8px;float: right;">返回</el-button>
+        </router-link>
       </div>
       <el-tabs tab-position="right" style="margin-top: 10px">
         <el-tab-pane label="企业信息">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -7,11 +7,14 @@
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-              <span>年审基本信息表</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="addshow =true" v-if="Status == '2'">提交审核</el-button>
-              </span>
-            </div>
+        <span>年审基本信息表</span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="addshow =true" v-if="Status == '2'">提交审核</el-button>
+        </span>
+        <router-link :to="'/oilsupplier/annualaudit'">
+          <el-button type="primary" size="mini" style="margin-left: 8px;float: right;">返回</el-button>
+        </router-link>
+      </div>
 
       <el-steps :active="Step" simple align-center finish-status="success">
         <el-step title="填写信息"></el-step>
@@ -30,13 +33,14 @@
                 <el-button type="primary" size="mini" @click="saveEntity">保存基本信息</el-button>
               </span> -->
             </div>
-            <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser" :disabled ="true"
-              :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
+            <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
+              :disabled="true" :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData"
+              @inputcompany="inputCompany">
             </tech-info>
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="企业情况" >
+        <el-tab-pane label="企业情况">
           <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>企业人员结构情况</span>
@@ -45,7 +49,7 @@
               </span> -->
             </div>
 
-            <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert" :disabled ="true" >
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert" :disabled="true">
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="企业员工总数">
@@ -134,7 +138,7 @@
               <span>近三年主要工程业绩</span>
               <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog">添加</el-button> -->
             </div>
-            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" :disabled ="true"
+            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" :disabled="true"
               :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></performance-list>
           </el-card>
 
@@ -166,7 +170,8 @@
 
         <el-tab-pane label="企业资质">
           <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId+''"
-                         :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px"></auditbus-list>
+            :SupplierTypeCode="classId" :Visiblebtn="this.formData.Status" height="360px" style="margin-top: 20px">
+          </auditbus-list>
         </el-tab-pane>
 
         <el-tab-pane label="提交审批">
@@ -184,7 +189,7 @@
         </el-tab-pane>
       </el-tabs>
     </el-card>
-     <el-dialog title="提交申请" :visible.sync="addshow" width="360px">
+    <el-dialog title="提交申请" :visible.sync="addshow" width="360px">
       <el-form label-width="90px" :model="entityForm" :rules="rules" ref="EntityFormref">
         <el-row>
           <el-col :span="24">
@@ -240,7 +245,7 @@
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
 
-   
+
   export default {
     computed: {
       ...mapGetters({
@@ -270,13 +275,13 @@
           label: 'Fullname',
           children: 'children'
         },
-        Step:'',
+        Step: '',
         organizeOption: [], // 审批部门
         auditerOption: [],
         addshow: false,
         canUpdateSupplier: true,
         dictData: null,
-        add_flat:false,
+        add_flat: false,
         applyLoading: false,
         equipmentList: [], //企业主要装备情况
         performanceList: [], //近三年主要工程业绩
@@ -393,9 +398,10 @@
         entrydetail: {
           process: 'oil_audit_apply',
           business: '',
-          instance: ''
+          instance: '',
+          Status:''
         },
-        Status:'',
+        Status: '',
         rules: {
           FirstAudit: [{
             required: true,
@@ -415,14 +421,14 @@
       if (this.$route.query.certid) {
         this.certId = this.$route.query.certid + ''
       }
-      this.Status = this.$route.query.Status +''
+      this.Status = this.$route.query.Status + ''
       this.Step = this.$route.query.Step
       this.WorkflowId = this.$route.query.WorkflowId + ''
       this.getDictOptions();
       this.getorgtreelist()
       this.formData.Id = this.serviceId
       this.initDatas();
-      console.log("---this.formData---",this.formData)
+      console.log("---this.formData---", this.formData)
       // console.log(this.serviceId);
       // if(this.serviceId != 'add' && this.serviceId>0) {
       //   this.formData.Id = this.serviceId;
@@ -529,13 +535,13 @@
       winningdialog() {
         this.$refs["winningList"].showDialog()
       },
-       initDatas() {
+      initDatas() {
         this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
-          console.log("---this.certId----",this.certId)
+          console.log("---this.certId----", this.certId)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
-            console.log("---res.data----",res.data)
+            console.log("---res.data----", res.data)
             this.formDataCert.WorkerTotal = this.formData.WorkerTotal
             this.formDataCert.ContractNum = this.formData.ContractNum
             this.formDataCert.UniversityNum = this.formData.UniversityNum
@@ -570,7 +576,7 @@
             if (this.certId && this.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
             }
-            console.log("---this.entrydetail----",this.entrydetail)
+            console.log("---this.entrydetail----", this.entrydetail)
 
           }).catch(err => {
             console.error(err)
@@ -586,20 +592,20 @@
         let auditstepcode = 'FIRST_TRIAL'
         api.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
           this.auditerOption = res.data.item
-          console.log("------this.auditerOption----",this.auditerOption)
+          console.log("------this.auditerOption----", this.auditerOption)
         }).catch(err => {
           console.error(err)
         })
       },
 
-      getorgtreelist () {
+      getorgtreelist() {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-          params
-        })
+            params
+          })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
           })
@@ -607,7 +613,7 @@
             console.error(err)
           })
       },
-      
+
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           this.dictData = res.data.items
@@ -700,5 +706,5 @@
       }
     }
   }
-</script>
 
+</script>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/annualfistaudit.vue

@@ -209,7 +209,7 @@
         entrydetail: {
           process: 'oil_audit_apply',
           business: '',
-          instance: ''
+          instance: '',
         },
         //查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -261,7 +261,7 @@
         entrydetail: {
           process: 'oil_audit_apply',
           business: '',
-          instance: ''
+          instance: '',
         },
         //查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
@@ -531,7 +531,7 @@
 
       getvalues(val) {
         this.entrydetail.business = val.Id
-        this.entrydetail.instance = val.WorkFlowId
+        this.entrydetail.instance = val.WorkflowId
         this.historyVisible = true
       },
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/_opera/operation.vue

@@ -158,7 +158,7 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="组织机构代码证">
+            <el-form-item label="组织代码">
               <!-- <el-radio v-model="formData.F02" label="1">是</el-radio> -->
               <el-switch v-model="formData.F02" active-value="1" inactive-value="0">
               </el-switch>
@@ -166,14 +166,14 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="税务登记证">
+            <el-form-item label="税务登记">
               <el-switch v-model="formData.F03" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="银行开户许可证">
+            <el-form-item label="开户许可">
               <el-switch v-model="formData.F04" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
@@ -201,7 +201,7 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="软件企业认定证书">
+            <el-form-item label="代理授权证书（代理商）">
               <el-switch v-model="formData.F08" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
@@ -215,119 +215,119 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="陆上石油天然气安全生产许可证">
+            <el-form-item label="特种劳动防护用品生产经营许可证">
               <el-switch v-model="formData.F10" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="海洋石油作业安全生产许可证">
+            <el-form-item label="辐射安全许可证">
               <el-switch v-model="formData.F11" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="辐射安全许可证">
+            <el-form-item label="危险化学品经营许可证">
               <el-switch v-model="formData.F12" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="石油工程技术服务企业资质证书">
+            <el-form-item label="成品油批发经营批准证书">
               <el-switch v-model="formData.F13" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="物业服务企业资质证书">
+            <el-form-item label="食品流通许可证">
               <el-switch v-model="formData.F14" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="工业清洗企业资质证书">
+            <el-form-item label="医疗器械经营企业许可证">
               <el-switch v-model="formData.F15" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="建设项目环境影响评价资格证书">
+            <el-form-item label="安全生产许可证">
               <el-switch v-model="formData.F16" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="消防设施维护保养资质证书">
+            <el-form-item label="特种设备制造许可证">
               <el-switch v-model="formData.F17" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="安全评价机构资质证书">
+            <el-form-item label="全国工业产品生产许可证">
               <el-switch v-model="formData.F18" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="工程咨询招标代理机构资质证书">
+            <el-form-item label="危险化学品使用许可证">
               <el-switch v-model="formData.F19" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="工程监督资质证书">
+            <el-form-item label="危险化学品登记证">
               <el-switch v-model="formData.F20" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="土地开发资格证">
+            <el-form-item label="危险化学品经营许可证">
               <el-switch v-model="formData.F21" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="房屋预售资格证">
+            <el-form-item label="化学品危险性鉴别与分类报告">
               <el-switch v-model="formData.F22" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="保安服务许可证">
+            <el-form-item label="中国国家强制性产品认证证书">
               <el-switch v-model="formData.F23" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="道路运输经营许可证">
+            <el-form-item label="产品型式认可证书">
               <el-switch v-model="formData.F24" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="机动车维修经营许可证">
+            <el-form-item label="制造计量器具许可证">
               <el-switch v-model="formData.F25" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="道路危险货物运输许可证">
+            <el-form-item label="特种劳动防护用品生产经营许可证">
               <el-switch v-model="formData.F26" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
@@ -341,95 +341,61 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="建筑安全许可证">
+            <el-form-item label="中油集团公司产品质量认可证书">
               <el-switch v-model="formData.F28" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="防火许可证">
+            <el-form-item label="辐射安全许可证">
               <el-switch v-model="formData.F29" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="印刷经营许可证">
+            <el-form-item label="中国船级社型式认可证书">
               <el-switch v-model="formData.F30" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="餐饮服务许可证">
+            <el-form-item label="涉及饮用水卫生安全产品卫生许可批件">
               <el-switch v-model="formData.F31" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="劳务派遣经营许可证">
+            <el-form-item label="成品油批发经营批准证书">
               <el-switch v-model="formData.F32" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="人力资源服务许可证">
+            <el-form-item label="医疗器械经营许可证">
               <el-switch v-model="formData.F33" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="国家实验室认可证书">
+            <el-form-item label="节能产品认证证书">
               <el-switch v-model="formData.F34" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="海洋石油专业设备检验检测机构证书">
+            <el-form-item label="预应力件生产许可证">
               <el-switch v-model="formData.F35" active-value="1" inactive-value="0">
               </el-switch>
             </el-form-item>
           </el-col>
 
-          <el-col :span="6">
-            <el-form-item label="安全生产检验检测证书">
-              <el-switch v-model="formData.F36" active-value="1" inactive-value="0">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="液化气钢瓶检验证书">
-              <el-switch v-model="formData.F37" active-value="1" inactive-value="0">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="国家电网承试承装承修许可证">
-              <el-switch v-model="formData.F38" active-value="1" inactive-value="0">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="建筑企业资质证书">
-              <el-switch v-model="formData.F39" active-value="1" inactive-value="0">
-              </el-switch>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="6">
-            <el-form-item label="中油集团监造许可">
-              <el-switch v-model="formData.F40" active-value="1" inactive-value="0">
-              </el-switch>
-            </el-form-item>
-          </el-col>
 <!--
           <el-col :span="6">
             <el-form-item label="">

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/index.vue

@@ -735,21 +735,21 @@
 
           {
             prop: 'F02',
-            label: '组织机构代码证',
+            label: '组织代码',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F03',
-            label: '税务登记证',
+            label: '税务登记',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F04 ',
-            label: '银行开户许可证',
+            label: '开户许可',
             width: 150,
             sort: true
           },
@@ -777,7 +777,7 @@
 
           {
             prop: 'F08',
-            label: '软件企业认定证书',
+            label: '代理授权证书（代理商）',
             width: 160,
             sort: true
           },
@@ -791,119 +791,119 @@
 
           {
             prop: 'F10',
-            label: '陆上石油天然气安全生产许可证',
+            label: '特种劳动防护用品生产经营许可证',
             width: 250,
             sort: true
           },
 
           {
             prop: 'F11',
-            label: '海洋石油作业安全生产许可证',
+            label: '辐射安全许可证',
             width: 250,
             sort: true
           },
 
           {
             prop: 'F12',
-            label: '辐射安全许可证',
+            label: '危险化学品经营许可证',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F13',
-            label: '石油工程技术服务企业资质证书',
+            label: '成品油批发经营批准证书',
             width: 250,
             sort: true
           },
 
           {
             prop: 'F14',
-            label: '物业服务企业资质证书',
+            label: '食品流通许可证',
             width: 190,
             sort: true
           },
 
           {
             prop: 'F15',
-            label: '工业清洗企业资质证书',
+            label: '医疗器械经营企业许可证',
             width: 190,
             sort: true
           },
 
           {
             prop: 'F16',
-            label: '建设项目环境影响评价资格证书',
+            label: '安全生产许可证',
             width: 250,
             sort: true
           },
 
           {
             prop: 'F17',
-            label: '消防设施维护保养资质证书',
+            label: '特种设备制造许可证',
             width: 250,
             sort: true
           },
 
           {
             prop: 'F18',
-            label: '安全评价机构资质证书',
+            label: '全国工业产品生产许可证',
             width: 190,
             sort: true
           },
 
           {
             prop: 'F19',
-            label: '工程咨询招标代理机构资质证书',
+            label: '危险化学品使用许可证',
             width: 250,
             sort: true
           },
 
           {
             prop: 'F20',
-            label: '工程监督资质证书',
+            label: '危险化学品登记证',
             width: 160,
             sort: true
           },
 
           {
             prop: 'F21',
-            label: '土地开发资格证',
+            label: '危险化学品经营许可证',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F22',
-            label: '房屋预售资格证',
+            label: '化学品危险性鉴别与分类报告',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F23',
-            label: '保安服务许可证',
+            label: '中国国家强制性产品认证证书',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F24',
-            label: '道路运输经营许可证',
+            label: '产品型式认可证书',
             width: 180,
             sort: true
           },
 
           {
             prop: 'F25',
-            label: '机动车维修经营许可证',
+            label: '食品生产许可证',
             width: 190,
             sort: true
           },
 
           {
             prop: 'F26',
-            label: '道路危险货物运输许可证',
+            label: '制造计量器具许可证',
             width: 200,
             sort: true
           },
@@ -917,101 +917,60 @@
 
           {
             prop: 'F28',
-            label: '建筑安全许可证',
+            label: '中油集团公司产品质量认可证书',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F29',
-            label: '防火许可证',
+            label: '辐射安全许可证',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F30',
-            label: '印刷经营许可证',
+            label: '中国船级社型式认可证书',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F31',
-            label: '餐饮服务许可证',
+            label: '涉及饮用水卫生安全产品卫生许可批件',
             width: 150,
             sort: true
           },
 
           {
             prop: 'F32',
-            label: '劳务派遣经营许可证',
+            label: '成品油批发经营批准证书',
             width: 190,
             sort: true
           },
 
           {
             prop: 'F33',
-            label: '人力资源服务许可证',
+            label: '医疗器械经营许可证',
             width: 180,
             sort: true
           },
 
           {
             prop: 'F34',
-            label: '国家实验室认可证书',
+            label: '节能产品认证证书',
             width: 180,
             sort: true
           },
 
           {
             prop: 'F35',
-            label: '海洋石油专业设备检验检测机构证书',
+            label: '预应力件生产许可证',
             width: 270,
             sort: true
           },
 
-          {
-            prop: 'F36',
-            label: '安全生产检验检测证书',
-            width: 190,
-            sort: true
-          },
-
-          {
-            prop: 'F37',
-            label: '液化气钢瓶检验证书',
-            width: 180,
-            sort: true
-          },
-
-          {
-            prop: 'F38',
-            label: '国家电网承试承装承修许可证',
-            width: 250,
-            sort: true
-          },
-
-          {
-            prop: 'F39',
-            label: '建筑企业资质证书',
-            width: 170,
-            sort: true
-          },
-
-          {
-            prop: 'F40',
-            label: '中油集团监造许可',
-            width: 170,
-            sort: true
-          },
-          {
-            prop: 'Remark',
-            label: '备注',
-            width: 100,
-            sort: true
-          }
-
         ],
         organizeProps: {
           value: 'id',