准入提交年审及增项修改，企业用户提交增项修改

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

@@ -300,7 +300,7 @@ func (this *AnnualAuditController) AddEntity() {
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	firstAudit := this.GetString("firstAudit")
 	json.Unmarshal(jsonBlob, &model)
-	where := "SupplierId = " + utils.ToStr(model.SupplierId) + " and SupplierTypeName = " + model.SupplierTypeName + "and Status < 5"
+	where := "SupplierId = " + utils.ToStr(model.SupplierId) + " and SupplierTypeName = " + model.SupplierTypeName + " and Status < 5"
 	var auditentity []annualaudit.OilAnnualAudit
 	svc.GetEntitysByWhere(""+OilAnnualAuditName, where, &auditentity)
 	if len(auditentity) == 1 {

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

@@ -35,14 +35,11 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <router-link :to="'/oilsupplier/annualaudit'">
-            <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0">
-              年审申请</el-button>
-          </router-link>
-          <!--v-if="formData.Step>=5"-->
-          <router-link :to="'/oilsupplier/supplierappend/basislist'">
-            <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
-          </router-link>
+          <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0"
+            @click="annaudit">
+            年审申请</el-button>
+          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0" @click="qppend">增项申请
+          </el-button>
           <router-link :to="'/oilsupplier/supplier/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -203,8 +200,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat" :candelete="delete_flat"
-            height="360px" style="margin-top: 20px"></business-list>
+          <business-list ref="businessList" :data.sync="businessList" @close="getbuslist" :canadd="add_flat"
+            :candelete="delete_flat" height="360px" style="margin-top: 20px"></business-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" :flag="flag"
@@ -226,12 +223,12 @@
         </el-tab-pane>
 
         <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
-          <!--<el-card class="box-card" style="margin-top: 20px">-->
-            <!--<div slot="header" class="clearfix">-->
-              <!--<span>审批历史</span>-->
-            <!--</div>-->
-            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
-          <!--</el-card>-->
+        <!--<el-card class="box-card" style="margin-top: 20px">-->
+        <!--<div slot="header" class="clearfix">-->
+        <!--<span>审批历史</span>-->
+        <!--</div>-->
+        <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+        <!--</el-card>-->
         <!--</el-tab-pane>-->
 
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
@@ -239,13 +236,15 @@
       </el-tabs>
 
       <div style="float: right; margin: 20px;">
-        <el-button ref="floatNxtBtn" type="primary" plain size="mini" @click="backTab" v-if="parseInt(activeName) > 0">上一步</el-button>
-        <el-button ref="floatBtn" type="primary" plain size="mini" @click="nextTab" v-if="parseInt(activeName) < totalTab">下一步</el-button>
+        <el-button ref="floatNxtBtn" type="primary" plain size="mini" @click="backTab" v-if="parseInt(activeName) > 0">
+          上一步</el-button>
+        <el-button ref="floatBtn" type="primary" plain size="mini" @click="nextTab"
+          v-if="parseInt(activeName) < totalTab">下一步</el-button>
       </div>
     </el-card>
 
     <el-dialog title="提交初审" :visible.sync="dialogVisible" width="520px">
-      <el-form ref="searchForm" label-width="100px" size="mini"> 
+      <el-form ref="searchForm" label-width="100px" size="mini">
         <el-row>
           <el-col :span="24">
             <el-form-item label="初审人员">
@@ -316,6 +315,7 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import annapi from '@/api/oilsupplier/annualaudit'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
@@ -553,7 +553,29 @@
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
-        }
+        },
+        appendformData: {
+          Id: '',
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
+          RecUnitFlag: '', //推荐单位的级联Id标记
+          RecUnitId: '', //推荐单位编码
+          RecUnitName: '', //推荐单位名称
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
+        },
+        annentityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '02',
+          FirstAudit: '',
+          auditer: '',
+          Step: 0,
+          Remark: ''
+        },
       }
     },
 
@@ -589,6 +611,71 @@
       this.orgtreeChange(this.majorDept)
     },
     methods: {
+      annaudit() {
+        this.annentityForm.supplierId = parseInt(this.serviceId)
+        annapi.addEntity(this.annentityForm, this.annentityForm.auditer, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            let annId= res.data.item;
+            this.$router.push({
+              path: '/oilsupplier/annualaudit/' + this.serviceId + '/bassicoperation',
+              query: {
+                certid: this.certId,
+                //WorkflowId: ,
+                Status: 0,
+                Step: 1,
+                annualId: annId,
+              }
+            })
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+
+      },
+      qppend() {
+        let _this = this
+        _this.appendformData.SupplierId = parseInt(this.serviceId)
+        _this.appendformData.SupplierCertId = parseInt(this.certId)
+        _this.appendformData.AppendType = '02'
+        _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
+          .then(res => {
+            if (res.data.code === 0) {
+              //this.entityList = res.data.item
+              let AppendId = res.data.info
+              this.$router.push({
+                path: `/oilsupplier/supplierappend/2/basisdataopera`,
+                query: {
+                  Id: AppendId,
+                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+                }
+              })
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+
+      },
       orgtreeChange(val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
@@ -718,12 +805,12 @@
             if (this.formData.Status > 0) {
               this.add_flat = false
             }
-            if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
+            if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
               this.delete_flat = false
             }
-              if(this.formData.CredentialFlag!=""){
-                this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
-              }
+            if (this.formData.CredentialFlag != "") {
+              this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
+            }
             this.$refs['BasisInfo'].CityAry = []
             this.$refs['BasisInfo'].CityAry.push(this.formData.Province)
             this.$refs['BasisInfo'].CityAry.push(this.formData.City)

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

@@ -41,13 +41,11 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
-          <router-link :to="'/oilsupplier/annualaudit'">
-            <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0">
-              年审申请</el-button>
-          </router-link>
-          <router-link :to="'/oilsupplier/supplierappend/goodslist'">
-            <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
-          </router-link>
+          <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0"
+            @click="annaudit">
+            年审申请</el-button>
+          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0" @click="qppend">增项申请
+          </el-button>
           <router-link :to="'/oilsupplier/supplier/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回</el-button>
           </router-link>
@@ -210,8 +208,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" :candelete="delete_flat" height="360px"
-            style="margin-top: 20px"></goods-list>
+          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat"
+            :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" :flag="flag"
@@ -233,20 +231,22 @@
         </el-tab-pane>
 
         <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
-          <!--<el-card class="box-card" style="margin-top: 20px">-->
-            <!--<div slot="header" class="clearfix">-->
-              <!--<span>审批历史</span>-->
-            <!--</div>-->
-            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
-          <!--</el-card>-->
+        <!--<el-card class="box-card" style="margin-top: 20px">-->
+        <!--<div slot="header" class="clearfix">-->
+        <!--<span>审批历史</span>-->
+        <!--</div>-->
+        <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+        <!--</el-card>-->
         <!--</el-tab-pane>-->
 
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5"></el-tab-pane>
       </el-tabs>
 
       <div style="float: right; margin: 20px;">
-        <el-button ref="floatNxtBtn" type="primary" plain size="mini" @click="backTab" v-if="parseInt(activeName) > 0">上一步</el-button>
-        <el-button ref="floatBtn" type="primary" plain size="mini" @click="nextTab" v-if="parseInt(activeName) < totalTab">下一步</el-button>
+        <el-button ref="floatNxtBtn" type="primary" plain size="mini" @click="backTab" v-if="parseInt(activeName) > 0">
+          上一步</el-button>
+        <el-button ref="floatBtn" type="primary" plain size="mini" @click="nextTab"
+          v-if="parseInt(activeName) < totalTab">下一步</el-button>
       </div>
 
     </el-card>
@@ -321,6 +321,7 @@
   } from "vuex";
   import api from "@/api/oilsupplier/supplier";
   import apiCert from "@/api/oilsupplier/suppliercert";
+  import annapi from '@/api/oilsupplier/annualaudit'
   import SupplierFileTable from "@/pages/oilsupplier/supplierfile/table.vue";
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
   import WfBackHistory from "@/components/workflow/wfbackhistory.vue";
@@ -513,7 +514,7 @@
           HseTraining: '0',
           AuditIndex: 0,
           PACNumber: "",
-          SupplierCertificate:""
+          SupplierCertificate: ""
         },
 
         formDataCert: {
@@ -531,7 +532,7 @@
           Status: 0
         },
         add_flat: true,
-        delete_flat:true,
+        delete_flat: true,
         entrydetail: {
           process: "oil_supplier_apply_1",
           business: "",
@@ -556,7 +557,29 @@
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
-        }
+        },
+        appendformData: {
+          Id: '',
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
+          RecUnitFlag: '', //推荐单位的级联Id标记
+          RecUnitId: '', //推荐单位编码
+          RecUnitName: '', //推荐单位名称
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
+        },
+        annentityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '01',
+          FirstAudit: '',
+          auditer: '',
+          Step: 0,
+          Remark: ''
+        },
       };
     },
     mounted() {
@@ -595,6 +618,71 @@
       this.orgtreeChange(this.majorDept)
     },
     methods: {
+      annaudit() {
+        this.annentityForm.supplierId = parseInt(this.serviceId)
+        console.log("----this.ann",this.annentityForm)
+        annapi.addEntity(this.annentityForm, this.annentityForm.auditer, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            let annId= res.data.item;
+            this.$router.push({
+              path: '/oilsupplier/annualaudit/' + this.serviceId + '/goodsoperation',
+              query: {
+                certid: this.certId,
+                //WorkflowId: ,
+                Status: 0,
+                Step: 1,
+                annualId: annId,
+              }
+            })
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      qppend() {
+        let _this = this
+        _this.appendformData.SupplierId = parseInt(this.serviceId)
+        _this.appendformData.SupplierCertId = parseInt(this.certId)
+        _this.appendformData.AppendType = '01'
+        _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
+          .then(res => {
+            if (res.data.code === 0) {
+              //this.entityList = res.data.item
+              let AppendId = res.data.info
+              this.$router.push({
+                path: `/oilsupplier/supplierappend/1/goodsdataopera`,
+                query: {
+                  Id: AppendId,
+                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+                }
+              })
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+
+      },
       orgtreeChange(val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
@@ -740,11 +828,11 @@
               if (this.formData.Status > 0) {
                 this.add_flat = false;
               }
-              if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
-              this.delete_flat = false
+              if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
+                this.delete_flat = false
               }
-              
-              if(this.formData.CredentialFlag!=""){
+
+              if (this.formData.CredentialFlag != "") {
                 this.$refs["GoodsInfo"].showorhid(this.formData.CredentialFlag)
               }
               this.$refs["GoodsInfo"].CityAry = [];

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

@@ -36,14 +36,11 @@
             <el-button slot="reference" plain size="mini" style="margin-right: 5px">查看进度</el-button>
           </el-popover>
 
-          <router-link :to="'/oilsupplier/annualaudit'">
-            <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0">
-              年审申请</el-button>
-          </router-link>
-          <!--v-if="formData.Step>=5"-->
-          <router-link :to="'/oilsupplier/supplierappend/techlist'">
-            <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0">增项申请</el-button>
-          </router-link>
+          <el-button type="primary" plain size="mini" style="margin-right:3px" :disabled="formDataCert.Status == 0"
+            @click="annaudit">
+            年审申请</el-button>
+          <el-button type="primary" plain size="mini" :disabled="formDataCert.Status == 0" @click="qppend">增项申请
+          </el-button>
           <router-link :to="'/oilsupplier/supplier/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回
             </el-button>
@@ -203,8 +200,8 @@
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat" :candelete="delete_flat" height="360px"
-            style="margin-top: 20px"></tech-list>
+          <tech-list ref="techList" :data.sync="techList" @close="getbuslist" :canadd="add_flat"
+            :candelete="delete_flat" height="360px" style="margin-top: 20px"></tech-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">
           <subfile-list ref="subfileList" :data.sync="subfileList" :canadd="add_flat" :flag="flag"
@@ -225,20 +222,22 @@
           </el-card>
         </el-tab-pane>
         <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
-          <!--<el-card class="box-card" style="margin-top: 20px">-->
-            <!--<div slot="header" class="clearfix">-->
-              <!--<span>审批历史</span>-->
-            <!--</div>-->
-            <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
-          <!--</el-card>-->
+        <!--<el-card class="box-card" style="margin-top: 20px">-->
+        <!--<div slot="header" class="clearfix">-->
+        <!--<span>审批历史</span>-->
+        <!--</div>-->
+        <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
+        <!--</el-card>-->
         <!--</el-tab-pane>-->
         <el-tab-pane label="供方缴费" v-if="formDataCert.Status == 5">
         </el-tab-pane>
       </el-tabs>
 
       <div style="float: right; margin: 20px;">
-        <el-button ref="floatNxtBtn" type="primary" plain size="mini" @click="backTab" v-if="parseInt(activeName) > 0">上一步</el-button>
-        <el-button ref="floatBtn" type="primary" plain size="mini" @click="nextTab" v-if="parseInt(activeName) < totalTab">下一步</el-button>
+        <el-button ref="floatNxtBtn" type="primary" plain size="mini" @click="backTab" v-if="parseInt(activeName) > 0">
+          上一步</el-button>
+        <el-button ref="floatBtn" type="primary" plain size="mini" @click="nextTab"
+          v-if="parseInt(activeName) < totalTab">下一步</el-button>
       </div>
     </el-card>
 
@@ -315,6 +314,7 @@
   } from 'vuex'
   import api from '@/api/oilsupplier/supplier'
   import apiCert from '@/api/oilsupplier/suppliercert'
+  import annapi from '@/api/oilsupplier/annualaudit'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
@@ -523,7 +523,7 @@
           WorkflowId: ''
         },
         add_flat: true,
-        delete_flat:true,
+        delete_flat: true,
         entrydetail: {
           process: 'oil_supplier_apply_1',
           business: '',
@@ -548,7 +548,29 @@
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
-        }
+        },
+        appendformData: {
+          Id: '',
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
+          RecUnitFlag: '', //推荐单位的级联Id标记
+          RecUnitId: '', //推荐单位编码
+          RecUnitName: '', //推荐单位名称
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
+        },
+        annentityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '03',
+          FirstAudit: '',
+          auditer: '',
+          Step: 0,
+          Remark: ''
+        },
       }
     },
     mounted() {
@@ -582,6 +604,71 @@
       this.orgtreeChange(this.majorDept)
     },
     methods: {
+      annaudit() {
+        this.annentityForm.supplierId = parseInt(this.serviceId)
+        console.log("----this.ann",this.annentityForm)
+        annapi.addEntity(this.annentityForm, this.annentityForm.auditer, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            let annId= res.data.item;
+            this.$router.push({
+              path: '/oilsupplier/annualaudit/' + this.serviceId + '/operation',
+              query: {
+                certid: this.certId,
+                //WorkflowId: ,
+                Status: 0,
+                Step: 1,
+                annualId: annId,
+              }
+            })
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+      qppend() {
+        let _this = this
+        _this.appendformData.SupplierId = parseInt(this.serviceId)
+        _this.appendformData.SupplierCertId = parseInt(this.certId)
+        _this.appendformData.AppendType = '03'
+        _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
+          .then(res => {
+            if (res.data.code === 0) {
+              //this.entityList = res.data.item
+              let AppendId = res.data.info
+              this.$router.push({
+                path: `/oilsupplier/supplierappend/3/techdataopera`,
+                query: {
+                  Id: AppendId,
+                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+                }
+              })
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+
+      },
       orgtreeChange(val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
@@ -711,12 +798,12 @@
             if (this.formData.Status > 0) {
               this.add_flat = false
             }
-            if ((this.formData.Status > 0 ) && (this.formData.Status !=4)) {
+            if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
               this.delete_flat = false
             }
-              if(this.formData.CredentialFlag!=""){
-                this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
-              }
+            if (this.formData.CredentialFlag != "") {
+              this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
+            }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.$refs["TechInfo"].CityAry = []
             this.$refs["TechInfo"].CityAry.push(this.formData.Province)
@@ -836,7 +923,7 @@
         }
       },
 
-      backTab () {
+      backTab() {
         if (this.formData.AuditIndex > 0) {
           this.totalTab = 4
         }
@@ -968,21 +1055,21 @@
             }
             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()
-                this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-              } else {
-                this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            }).catch(err => {
+              res => {
+                if (res.data.code === 0) {
+                  // 保存成功后，初始化数据，变成修改
+                  this.initDatas()
+                  this.$message({
+                    type: 'success',
+                    message: res.data.message
+                  })
+                } else {
+                  this.$message({
+                    type: 'warning',
+                    message: res.data.message
+                  })
+                }
+              }).catch(err => {
               console.error(err)
             })
           } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -12,8 +12,10 @@
           </span>
           <span style="float: right;">
             <router-link :to="'/oilsupplier/supplierappend/2/basisdataopera'">
-              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+              <el-button v-if="IsCompanyUser == 0" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
             </router-link>
+            <el-button  v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addappendcom">添加
+            </el-button>
           </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
             <el-form-item label="上报时间">
@@ -239,6 +241,18 @@
         IsCompanyUser: 0,
         supplierList:[],
         suplen:0,
+        appendformData: {
+          Id: '',
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
+          RecUnitFlag: '', //推荐单位的级联Id标记
+          RecUnitId: '', //推荐单位编码
+          RecUnitName: '', //推荐单位名称
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
+        },
       }
     },
     created() {
@@ -278,6 +292,38 @@
         })
       },
 
+      addappendcom() {
+        let _this = this
+        _this.appendformData.AppendType = '02'
+        _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
+          .then(res => {
+            if (res.data.code === 0) {
+              //this.entityList = res.data.item
+              let AppendId = res.data.info
+              this.$router.push({
+                path: `/oilsupplier/supplierappend/2/basisdataopera`,
+                query: {
+                  Id: AppendId,
+                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+                }
+              })
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+
+      },
+
       getSupplierList() {
         let _this = this
         _this.supplierList = []
@@ -286,6 +332,8 @@
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
+              _this.appendformData.SupplierId = _this.supplierList[0].SupplierId
+              _this.appendformData.SupplierCertId = _this.supplierList[0].SupplierCertId
             }
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/goodslist.vue

@@ -12,8 +12,10 @@
         </span>
           <span style="float: right;">
           <router-link :to="'/oilsupplier/supplierappend/1/goodsdataopera'">
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+            <el-button v-if="IsCompanyUser == 0" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
+          <el-button  v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addappendcom">添加
+            </el-button>
         </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
             <el-form-item label="上报时间">
@@ -239,6 +241,18 @@
         IsCompanyUser: 0,
         supplierList:[],
         suplen:0,
+        appendformData: {
+          Id: '',
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
+          RecUnitFlag: '', //推荐单位的级联Id标记
+          RecUnitId: '', //推荐单位编码
+          RecUnitName: '', //推荐单位名称
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
+        },
       }
     },
     created() {
@@ -278,6 +292,38 @@
         })
       },
 
+      addappendcom() {
+        let _this = this
+        _this.appendformData.AppendType = '01'
+        _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
+          .then(res => {
+            if (res.data.code === 0) {
+              //this.entityList = res.data.item
+              let AppendId = res.data.info
+              this.$router.push({
+                path: `/oilsupplier/supplierappend/1/basisdataopera`,
+                query: {
+                  Id: AppendId,
+                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+                }
+              })
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+
+      },
+
       getSupplierList() {
         let _this = this
         _this.supplierList = []
@@ -286,6 +332,8 @@
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
+              _this.appendformData.SupplierId = _this.supplierList[0].SupplierId
+              _this.appendformData.SupplierCertId = _this.supplierList[0].SupplierCertId
             }
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/techlist.vue

@@ -12,8 +12,12 @@
           </span>
           <span style="float: right;">
             <router-link :to="'/oilsupplier/supplierappend/3/techdataopera'">
-              <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
+              <el-button v-if="IsCompanyUser == 0" type="primary" size="mini"
+                style="margin-left:10px; margin-top: -4px;">添加</el-button>
             </router-link>
+            <el-button v-if="IsCompanyUser == 1" type="primary" size="mini" style="margin-left:10px; margin-top: -4px;"
+              @click="addappendcom">添加
+            </el-button>
           </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
             <el-form-item label="上报时间">
@@ -240,6 +244,18 @@
         IsCompanyUser: 0,
         supplierList: [],
         suplen: 0,
+        appendformData: {
+          Id: '',
+          Step: 1,
+          Status: '',
+          SupplierId: 0,
+          SupplierCertId: 0,
+          RecUnitFlag: '', //推荐单位的级联Id标记
+          RecUnitId: '', //推荐单位编码
+          RecUnitName: '', //推荐单位名称
+          AppendType: '', //增项类别(01 物资类，02 基建类，03 技术服务类)
+          Remark: '', //备注
+        },
       }
     },
     created() {
@@ -279,6 +295,39 @@
         })
       },
 
+      addappendcom() {
+        let _this = this
+
+        _this.appendformData.AppendType = '03'
+        _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
+          .then(res => {
+            if (res.data.code === 0) {
+              //this.entityList = res.data.item
+              let AppendId = res.data.info
+              this.$router.push({
+                path: `/oilsupplier/supplierappend/3/basisdataopera`,
+                query: {
+                  Id: AppendId,
+                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+                }
+              })
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+
+      },
+
       getSupplierList() {
         let _this = this
         _this.supplierList = []
@@ -287,6 +336,8 @@
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
+              _this.appendformData.SupplierId = _this.supplierList[0].SupplierId
+              _this.appendformData.SupplierCertId = _this.supplierList[0].SupplierCertId
             }
           })
           .catch(err => {