增项审核修改

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -7,11 +7,12 @@ import (
 type OilSupplierCertAppend struct {
 	Id             int       `xorm:"not null pk autoincr INT(10)"`
 	SupplierId     int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
+	SupplierName   string    `xorm:"comment('供方名称') VARCHAR(200)"`
 	SupplierCertId int       `xorm:"not null comment('供方准入证书信息表主键') INT(10)"`
 	ApplyDate      time.Time `xorm:"comment('申请日期') DATETIME"`
 	RecUnitFlag    string    `xorm:"comment('推荐单位的级联Id标记') VARCHAR(200)"`
 	RecUnitId      string    `xorm:"comment('推荐单位编码') VARCHAR(50)"`
-	RecUnitName    string    `xorm:"comment('推荐单位名称') VARCHAR(50)"`
+	RecUnitName    string    `xorm:"comment('推荐单位名称') VARCHAR(200)"`
 	AppendType     string    `xorm:"comment('增项类别(1 物资类，2 基建类，3 技术服务类)') VARCHAR(10)"`
 	DenyReason     string    `xorm:"comment('退回原因') VARCHAR(50)"`
 	AuditDate      time.Time `xorm:"comment('审核日期') DATETIME"`

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

@@ -556,11 +556,13 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 
 	step := 2
 	status := ""
+	backstatus := "0"
 	var userIds string
 	if supplierCertAppendEntity.Status == "1" {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.SECOND_TRIAL_STATUS
 		step = 2
+		backstatus = "-1"
 		supplierCertAppendEntity.ThirdAudit = dataother.MajorDept
 		cols := []string{
 			"ThirdAudit",
@@ -569,6 +571,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	} else if supplierCertAppendEntity.Status == "2" {
 		status = suppliercert.THIRD_TRIAL_STATUS
 		step = 2
+		backstatus = "-2"
 		//var users []suppliercert.UserList
 		//where := "OrganizeId=" + strconv.Itoa(supplierCertAppendEntity.ThirdAudit) + " and AuditStepCode='" + workflow.PROF_RECE + "'"
 		//certSrv.GetEntitysByWhere(OilAuditSettingName, where, &users)
@@ -583,9 +586,11 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PROF_AUDIT_STATUS
 		step = 2
+		backstatus = "-3"
 	} else if supplierCertAppendEntity.Status == "4" {
 		status = suppliercert.CENT_AUDIT_STATUS
 		step = 2
+		backstatus = "-4"
 		//var users []suppliercert.UserList
 		//where := "OrganizeId=100000178 and AuditStepCode='" + workflow.PROF_REGULATION + "'"
 		//certSrv.GetEntitysByWhere(OilAuditSettingName, where, &users)
@@ -601,6 +606,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.PAYING_AUDIT_STATUS
 		step = 3
+		backstatus = "-5"
 	}
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
@@ -651,7 +657,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 		if receiveVal == "true" {
 			if supplierCertAppendEntity.Status == "5" {
-				supplierCertAppendEntity.Status = "-1"
+				supplierCertAppendEntity.Status = backstatus
 				supplierCertAppendEntity.Step = step
 				supplierCertAppendEntity.AuditIndex = supplierCertAppendEntity.AuditIndex + 1
 			}else {

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

@@ -57,6 +57,43 @@ func (this *OilSupplierCertAppendSubController) GetList() {
 	this.ServeJSON()
 }
 
+// @Title 获取列表
+// @Description 获取列表
+// @Success 200 {object} []suppliercertappendsub.OilSupplierCertAppendSub
+// @router /getListappend [get]
+func (this *OilSupplierCertAppendSubController) GetListAppend() {
+
+	//获取分页信息
+	//page := this.GetPageInfoForm()
+	//where := " 1=1 "
+	//orderby := "Id"
+	//asc := false
+	//Order := this.GetString("Order")
+	//Prop := this.GetString("Prop")
+	//if Order != "" && Prop != "" {
+	//	orderby = Prop
+	//	if Order == "asc" {
+	//		asc = true
+	//	}
+	//}
+
+	//SupplierCertAppendId := this.GetString("SupplierCertAppendId")
+	//if SupplierCertAppendId != "" {
+	//	where = where + " and SupplierCertAppendId = " + SupplierCertAppendId
+	//}
+	SupplierCertId := this.GetString("SupCertId")
+	SupplierTypeCode := this.GetString("SupTypeCode")
+	suwhere := " SupplierCertId = "+ SupplierCertId+ " and SupplierTypeCode = "+ SupplierTypeCode +" and Type = 2"
+	svc := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
+	var list []suppliercertsub.OilSupplierCertSub
+	//svc.GetEntitysByWhere(OilSupplierCertAppendSubName, where, &list)
+	svc.GetEntitysByOrderbyWhere(OilSupplierCertSubName, suwhere,"CreateOn asc", &list)
+	var datainfo ErrorDataInfo
+	datainfo.Item = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
 // @Title 添加
 // @Description 添加增项分类信息基建类
 // @Success	200	{object} controllers.Request

src/dashoo.cn/frontend_web/src/api/oilsupplier/supplierappendsub.js

@@ -6,6 +6,13 @@ export default {
       params: params
     });
   },
+  getListAppend(params, myAxios) {
+    return myAxios({
+      url: '/suppliercertappendsub/getListappend',
+      method: 'GET',
+      params: params
+    });
+  },
   getEntity(entityId, myAxios) {
     return myAxios({
       url: '/suppliercertappendsub/get/'+entityId,

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

@@ -25,7 +25,7 @@
           <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'">{{auditTitle}}</el-button>
-           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
+          <router-link :to="'/oilsupplier/addtionaudit/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
@@ -37,15 +37,10 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
-              <!-- <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="RecUnitName">
-                  <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">
-                    <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
+                    <el-option v-for="item in supplierList" :key="item.SupplierCertId" :label="item.SupplierName"
                       :value="item.SupplierId">
                     </el-option>
                   </el-select>
@@ -61,17 +56,36 @@
         </el-card>
         <!-- 增项分类列表 -->
         <el-card class="box-card" style="margin-top: 10px;">
-          <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
         </el-card>
+        <el-card class="box-card" style="margin-top: 10px;">
+          <div slot="header" class="clearfix">
+            <span><i class="icon icon-table2"></i> 企业资质</span>
+          </div>
+          <el-table :data="subfileList" border>
+            <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                  <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                    class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.EffectDate+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </el-card>
+
       </div>
     </el-card>
 
@@ -81,11 +95,6 @@
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
-        </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
@@ -120,11 +129,6 @@
         <el-form-item label="意见">
           <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
-          </el-cascader>
-        </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
@@ -138,8 +142,8 @@
             style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
         </el-form-item>
-        
-        
+
+
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
@@ -148,11 +152,6 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <!-- <el-form-item label="审批人部门">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
-          </el-cascader>
-        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
@@ -231,12 +230,13 @@
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
-        companyid:'',
+        companyid: '',
         orgtreeprops: {
           value: 'id',
           label: 'name',
           children: 'children'
         },
+        subfileList: [],
         auditBtn: false,
         auditstepcode: '',
         dictData: null,
@@ -328,7 +328,6 @@
       this.editFlag = '1'
       this.getEntityById()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
-      this.getSortList()
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() //获取供应方公司列表
@@ -358,6 +357,8 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
           }
+          this.getFileList()
+          this.getSortList()
           this.getDictOptions()
           this.isAccess()
           //显示公司名
@@ -391,16 +392,20 @@
       getSortList() {
         //分页及列表条件
         let params = {
-          _currentPage: this.currentPage,
-          _size: this.size,
-          Order: this.Column.Order,
-          Prop: this.Column.Prop,
+          // _currentPage: this.currentPage,
+          // _size: this.size,
+          // Order: this.Column.Order,
+          // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
+          SupCertId: this.formData.SupplierCertId,
+          SupTypeCode: "02",
         };
+
         //访问接口
-        api.getList(params, this.$axios).then(res => {
-          this.entityList = res.data.items
-          this.currentItemCount = res.data.currentItemCount
+        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)
         })
@@ -416,6 +421,33 @@
           this.dialogMakeSure = true
         }
       },
+      //获取资质文件
+      getFileList() {
+        this.SupplierId = this.formData.SupplierId
+        this.SupplierTypeCode = this.formData.AppendType
+        let _this = this
+        const params = {
+          SupplierId: this.SupplierId,
+          SupplierTypeCode: this.SupplierTypeCode,
+          _currentPage: 1,
+          _size: 1000,
+        }
+        _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])
+              _this.subfileList[idx].FileUrlList = _this.subfileList[idx].FileUrl.split('$')
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
       //审批历史
       auhistory() {
         this.audithistoryshow = true
@@ -527,7 +559,11 @@
           console.error(err)
         })
       },
-
+      fileurlcut(val, index) {
+        let fileurlall = val.split('$')[index]
+        let fileurl = fileurlall.split("|")
+        return fileurl[0]
+      },
 
       //列表排序功能
       orderby(column) {

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

@@ -37,11 +37,6 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
-              <!-- <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="RecUnitName">
-                  <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">
@@ -51,11 +46,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="12">
-                <el-form-item label="推荐单位编码" prop="RecUnitId">
-                  <el-input v-model="formData.RecUnitId" placeholder="请输入推荐单位编码"></el-input>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="24">
                 <el-form-item label="备注" prop="Remark">
                   <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
@@ -69,16 +59,35 @@
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项分类</span>
           </div>
-          <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
+        </el-card>
+
+        <el-card class="box-card" style="margin-top: 10px;">
+          <div slot="header" class="clearfix">
+            <span><i class="icon icon-table2"></i> 企业资质</span>
+          </div>
+          <el-table :data="subfileList" border>
+            <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                  <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                    class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.EffectDate+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
+          </el-table>
         </el-card>
       </div>
     </el-card>
@@ -89,11 +98,6 @@
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
-        </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
@@ -128,11 +132,6 @@
         <el-form-item label="意见">
           <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
-          </el-cascader>
-        </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
@@ -146,8 +145,8 @@
             style="width: 100%" v-model="majorDept" placeholder="请选择组织">
           </el-cascader>
         </el-form-item>
-        
-        
+
+
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top: -25px">
         <el-button size="small" @click="dialogMakeSure2 = false">取 消</el-button>
@@ -156,11 +155,6 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <!-- <el-form-item label="审批人部门">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
-          </el-cascader>
-        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
@@ -240,7 +234,7 @@
         aduitlabel: '审核人',
         auditer: '',
         auditTitle: '审批',
-        companyid:'',
+        companyid: '',
         orgtreeprops: {
           value: 'id',
           label: 'name',
@@ -267,6 +261,7 @@
           AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '', //备注
         },
+        subfileList: [],
         backhistroy: {
           certId: '',
           classId: '01',
@@ -276,10 +271,10 @@
         dialogTitle: '',
         dialogFormData: {
           Id: '',
-          SupplierId: 1, //供方表ID
-          SupplierCertId: 1, //供方证书表ID
+          SupplierId: '', //供方表ID
+          SupplierCertId: '', //供方证书表ID
           SupplierCertAppendId: '', //增项信息表ID
-          SubClassId: 2, //分类表主键（物资类或基建类或技术服务类）
+          SubClassId: '', //分类表主键（物资类或基建类或技术服务类）
           SortFlag: '', //分类标记
           Code: '', //分类编码
           Name: '', //分类名称
@@ -337,7 +332,6 @@
       this.editFlag = '1'
       this.getEntityById()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
-      this.getSortList()
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() //获取供应方公司列表
@@ -367,6 +361,8 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
           }
+          this.getFileList()
+          this.getSortList()
           this.getDictOptions()
           this.isAccess()
           //显示公司名
@@ -394,26 +390,58 @@
           .catch(err => {
             console.error(err)
           })
+      },
+       //获取资质文件
+      getFileList() {
+        this.SupplierId = this.formData.SupplierId
+        this.SupplierTypeCode = this.formData.AppendType
+        let _this = this
+        const params = {
+          SupplierId: this.SupplierId,
+          SupplierTypeCode: this.SupplierTypeCode,
+          _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])
+              _this.subfileList[idx].FileUrlList = _this.subfileList[idx].FileUrl.split('$')
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
       },
       //审批历史
       auhistory() {
         this.audithistoryshow = true
       },
 
-      //获取增项分类表
+     //获取增项分类表
       getSortList() {
         //分页及列表条件
         let params = {
-          _currentPage: this.currentPage,
-          _size: this.size,
-          Order: this.Column.Order,
-          Prop: this.Column.Prop,
+          // _currentPage: this.currentPage,
+          // _size: this.size,
+          // Order: this.Column.Order,
+          // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
+          SupCertId: this.formData.SupplierCertId,
+          SupTypeCode: "01",
         };
+        console.log("----param",params)
         //访问接口
-        api.getList(params, this.$axios).then(res => {
-          this.entityList = res.data.items
-          this.currentItemCount = res.data.currentItemCount
+        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)
         })
@@ -474,7 +502,7 @@
           })
       },
       auditOrgChange() {
-        
+
         console.log(this.formData.Status, 'status')
         let auditstepcode = ''
         if (this.formData.Status === '1') {
@@ -537,7 +565,11 @@
           console.error(err)
         })
       },
-
+      fileurlcut(val, index) {
+        let fileurlall = val.split('$')[index]
+        let fileurl = fileurlall.split("|")
+        return fileurl[0]
+      },
 
       //列表排序功能
       orderby(column) {

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

@@ -37,11 +37,6 @@
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData" :disabled="true">
             <el-row>
-              <!-- <el-col :span="12">
-                <el-form-item label="推荐单位名称" prop="RecUnitName">
-                  <el-input v-model="formData.RecUnitName" placeholder="请输入推荐单位名称"></el-input>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="12">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
                   <el-select v-model="supplierOptions" filterable placeholder="请选择供应方公司" style="width: 100%">
@@ -51,11 +46,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="12">
-                <el-form-item label="推荐单位编码" prop="RecUnitId">
-                  <el-input v-model="formData.RecUnitId" placeholder="请输入推荐单位编码"></el-input>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="24">
                 <el-form-item label="备注" prop="Remark">
                   <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
@@ -66,16 +56,35 @@
         </el-card>
         <!-- 增项分类列表 -->
         <el-card class="box-card" style="margin-top: 10px;">
-          <el-table :data="entityList" border height="calc(100vh - 345px)" style="width: 100%" @sort-change="orderby">
+          <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
             <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
           </el-table>
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination>
+        </el-card>
+
+        <el-card class="box-card" style="margin-top: 10px;">
+          <div slot="header" class="clearfix">
+            <span><i class="icon icon-table2"></i> 企业资质</span>
+          </div>
+          <el-table :data="subfileList" border>
+            <el-table-column prop="NeedFileType" label="资质名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                  <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                    class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ jstimehandle(scope.row.EffectDate+'') }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
+          </el-table>
         </el-card>
       </div>
     </el-card>
@@ -86,11 +95,6 @@
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <!-- <el-form-item label="专业科室" v-if="this.formData.Status == '1'">
-          <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" filterable
-            style="width: 100%" v-model="majorDept" placeholder="请选择组织">
-          </el-cascader>
-        </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
@@ -125,11 +129,6 @@
         <el-form-item label="意见">
           <el-input type="textarea" v-model="shenheForm.AuditorRemark" placeholder="请输入审核说明"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="复审部门" v-if="this.formData.Status == '1'">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
-          </el-cascader>
-        </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
@@ -152,11 +151,6 @@
     </el-dialog>
     <el-dialog title="分配" :visible.sync="dialogAllocation">
       <el-form :model="shenheForm" label-width="100px" ref="shenheForm">
-        <!-- <el-form-item label="审批人部门">
-          <el-cascader :options="secorgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
-            filterable style="width: 100%" @change="auditOrgChange" placeholder="请选择组织">
-          </el-cascader>
-        </el-form-item> -->
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
@@ -221,6 +215,7 @@
         }
       }
       return {
+        subfileList: [],
         audithistoryshow: false,
         auditerOptions: [], // 审核人员
         secauditerOptions: [],
@@ -354,7 +349,6 @@
       this.editFlag = '1'
       this.getEntityById()
       this.dialogFormData.SupplierCertAppendId = this.AppendId
-      this.getSortList()
       this.getorgtreelist()
       this.getorgtreelistbydeptid()
       this.getSupplierList() //获取供应方公司列表
@@ -384,6 +378,8 @@
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
           }
+          this.getSortList()
+          this.getFileList()
           this.getDictOptions()
           this.isAccess()
           //显示公司名
@@ -412,26 +408,57 @@
             console.error(err)
           })
       },
+       //获取资质文件
+      getFileList() {
+        this.SupplierId = this.formData.SupplierId
+        this.SupplierTypeCode = this.formData.AppendType
+        let _this = this
+        const params = {
+          SupplierId: this.SupplierId,
+          SupplierTypeCode: this.SupplierTypeCode,
+          _currentPage: 1,
+          _size: 1000,
+        }
+        _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])
+              _this.subfileList[idx].FileUrlList = _this.subfileList[idx].FileUrl.split('$')
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
 
       //审批历史
       auhistory() {
         this.audithistoryshow = true
       },
 
-      //获取增项分类表
+       //获取增项分类表
       getSortList() {
         //分页及列表条件
         let params = {
-          _currentPage: this.currentPage,
-          _size: this.size,
-          Order: this.Column.Order,
-          Prop: this.Column.Prop,
+          // _currentPage: this.currentPage,
+          // _size: this.size,
+          // Order: this.Column.Order,
+          // Prop: this.Column.Prop,
           SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
+          SupCertId: this.formData.SupplierCertId,
+          SupTypeCode: "03",
         };
+
         //访问接口
-        api.getList(params, this.$axios).then(res => {
-          this.entityList = res.data.items
-          this.currentItemCount = res.data.currentItemCount
+        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)
         })
@@ -554,8 +581,11 @@
           console.error(err)
         })
       },
-
-
+      fileurlcut(val, index) {
+        let fileurlall = val.split('$')[index]
+        let fileurl = fileurlall.split("|")
+        return fileurl[0]
+      },
 
       //列表排序功能
       orderby(column) {

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

@@ -42,7 +42,7 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="RecUnitName" label="供方名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">

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

@@ -42,7 +42,7 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="RecUnitName" label="供方名称" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">

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

@@ -39,7 +39,7 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="推荐单位名称" sortable min-width="130" align="center"
+        <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
           show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -54,44 +54,19 @@
         </el-table-column> -->
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <!-- <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="复审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert> -->
-            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级复审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待专业科室审核" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初始" type="info">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级初审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待集中评审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业科室接收" type="success">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待交费" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待入库" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="完成" type="success">
+           <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
+            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+            <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
+            <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
+            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
             </el-alert>
           </template>
         </el-table-column>

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

@@ -24,7 +24,7 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
-            v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -35,13 +35,13 @@
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text" v-if="formData.Status <= 0 && formData.Status != -5" @click="saveEntity()">保存信息</el-button>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
               <el-col :span="8">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                  <el-select ref="suppselect" :disabled="formData.Status>0" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
                     style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
@@ -51,7 +51,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item label="备注" prop="Remark">
-                  <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
+                  <el-input :disabled="formData.Status>0" type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -61,13 +61,13 @@
         <el-card class="box-card" style="margin-top: 10px;">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项分类</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text" v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
           </div>
           <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column label="操作" min-width="100" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                  :disabled="scope.row.Type == '1'">删除</el-button>
+                  :disabled="scope.row.Type == '1'||formData.Status != '0'">删除</el-button>
               </template>
             </el-table-column>
             <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column> -->
@@ -88,7 +88,7 @@
             <el-table-column label="操作" width="150" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)"
-                  :disabled="scope.row.SupType != 2">编辑
+                  :disabled="scope.row.SupType != 2||formData.Status != '0'">编辑
                 </el-button>
               </template>
             </el-table-column>
@@ -132,11 +132,11 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="资质文件">
-              <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
-                  :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload">
-                  <i class="el-icon-plus attach-uploader-icon"></i>
-                  <div slot="tip" class="el-upload__tip">大小为512KB-5MB</div>
-                </el-upload>
+              <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach" :http-request="uploadrequest"
+                class="attach-uploader" :before-upload="beforeAvatarUpload">
+                <i class="el-icon-plus attach-uploader-icon"></i>
+                <div slot="tip" class="el-upload__tip">大小为512KB-5MB</div>
+              </el-upload>
             </el-form-item>
           </el-col>
         </el-row>
@@ -268,7 +268,8 @@
     },
     computed: {
       ...mapGetters({
-        authUser: 'authUser'
+        authUser: 'authUser',
+        session: 'session'
       })
     },
     name: 'basisdataOperation',
@@ -365,6 +366,7 @@
           Step: 1,
           Type: '',
           Status: '',
+          SupplierName:'',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -640,7 +642,7 @@
       //获取供应方公司列表
       getSupplierList() {
         let _this = this
-        _this.$axios.get('/suppliercertappend/getsupplier/' + '2', {})
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '02', {})
           .then(res => {
             _this.supplierList = res.data
           })
@@ -740,6 +742,7 @@
 
       //更新增项信息
       updateData() {
+        this.formData.SupplierName = this.$refs.suppselect.selectedLabel + ''
         let _this = this
         api2.updateEntity(_this.Id, _this.formData, _this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -785,6 +788,7 @@
       //添加增项信息
       addAppend() {
         this.formData.AppendType = '02'
+        this.formData.SupplierName = this.$refs.suppselect.selectedLabel + ''
         this.$axios.post('/suppliercertappend/addappend/', this.formData)
           .then(res => {
             if (res.data.code === 0) {

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

@@ -24,7 +24,7 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
-            v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -35,7 +35,7 @@
         <el-card class="box-card" style="margin-top: 20px">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text" v-if="formData.Status <= 0 && formData.Status != -5" @click="saveEntity()">保存信息</el-button>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
@@ -49,7 +49,7 @@
               </el-col> -->
               <el-col :span="8">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                  <el-select ref="suppselect" :disabled="formData.Status>0" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
                     style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
@@ -59,7 +59,7 @@
               </el-col>
               <el-col :span="16">
                 <el-form-item label="备注" prop="Remark">
-                  <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
+                  <el-input :disabled="formData.Status>0" type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -69,13 +69,13 @@
         <el-card class="box-card" style="margin-top: 10px;">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项分类</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text" v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
           </div>
           <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column label="操作" min-width="100" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                  :disabled="scope.row.Type == '1'">删除</el-button>
+                  :disabled="scope.row.Type == '1'||formData.Status != '0'">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
@@ -96,7 +96,7 @@
             <el-table-column label="操作" width="150" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)"
-                  :disabled="scope.row.SupType != 2">编辑
+                  :disabled="scope.row.SupType != 2||formData.Status != '0'">编辑
                 </el-button>
               </template>
             </el-table-column>
@@ -237,7 +237,8 @@
     },
     computed: {
       ...mapGetters({
-        authUser: 'authUser'
+        authUser: 'authUser',
+        session: 'session'
       })
     },
     name: 'oilsuppliercertappendsub',
@@ -269,6 +270,7 @@
         chooseAuditorVisible: false,
         orgtreelist: [], //二级单位
         AuditdialogShow: false, //提交审核弹框
+        filterText: '',
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         orgtreeprops: {
@@ -446,7 +448,7 @@
       //获取供应方公司列表
       getSupplierList() {
         let _this = this
-        _this.$axios.get('/suppliercertappend/getsupplier/' + '1', {})
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '01', {})
           .then(res => {
             _this.supplierList = res.data
           })
@@ -746,6 +748,7 @@
 
       //更新增项信息
       updateData() {
+        this.formData.SupplierName = this.$refs.suppselect.selectedLabel + ''
         let _this = this
         api2.updateEntity(_this.Id, _this.formData, _this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -790,6 +793,7 @@
 
       //添加增项信息
       addAppend() {
+        this.formData.SupplierName = this.$refs.suppselect.selectedLabel + ''
         let _this = this
         _this.formData.AppendType = '01'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)

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

@@ -24,7 +24,7 @@
           </el-popover>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
-            v-if="formData.Id !='' && (formData.Status == '0'||formData.Status == '')">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -35,7 +35,7 @@
         <el-card class="box-card">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项信息</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="saveEntity()">保存信息</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text" v-if="formData.Status <= 0 && formData.Status != -5" @click="saveEntity()">保存信息</el-button>
           </div>
           <el-form label-width="150px" ref="EntityForm" :rules="appendRules" :model="formData">
             <el-row>
@@ -49,7 +49,7 @@
               </el-col> -->
               <el-col :span="8">
                 <el-form-item label="供应方公司名称" prop="checkSelectedSupplier">
-                  <el-select v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
+                  <el-select ref="suppselect" :disabled="formData.Status>0" v-model="supplierOptions" filterable @change="getInfo" placeholder="请选择供应方公司"
                     style="width: 100%">
                     <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
                       :value="item.SupplierId">
@@ -64,7 +64,7 @@
               </el-col> -->
               <el-col :span="16">
                 <el-form-item label="备注" prop="Remark">
-                  <el-input type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
+                  <el-input :disabled="formData.Status>0" type="textarea" v-model="formData.Remark" placeholder="请输入"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -74,13 +74,13 @@
         <el-card class="box-card" style="margin-top: 10px;">
           <div slot="header">
             <span><i class="icon icon-table2"></i> 增项分类</span>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="addSortData()">添加</el-button>
+            <el-button style="float: right; padding: 3px 0" type="text" v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
           </div>
           <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
             <el-table-column label="操作" min-width="100" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                  :disabled="scope.row.Type == '1'">删除</el-button>
+                  :disabled="scope.row.Type == '1'||formData.Status != '0'">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column>
@@ -101,7 +101,7 @@
             <el-table-column label="操作" width="150" align="center" fixed>
               <template slot-scope="scope">
                 <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)"
-                  :disabled="scope.row.SupType != 2">编辑
+                  :disabled="scope.row.SupType != 2||formData.Status != '0'">编辑
                 </el-button>
               </template>
             </el-table-column>
@@ -243,7 +243,8 @@
     },
     computed: {
       ...mapGetters({
-        authUser: 'authUser'
+        authUser: 'authUser',
+        session: 'session'
       })
     },
     name: 'oilsuppliercertappendsub',
@@ -324,6 +325,7 @@
         auditer: '',
         auditerName: '',
         FirstAudit: '',
+        keyword: '', //查询关键字
         supplierList: [], //供应方公司列表
         supplierOptions: '', //已选择的供应方公司列表
         // serviceType: '', //服务类型()
@@ -419,7 +421,7 @@
         this.getSortList()
       }
       this.getOrgTreeList() //获取推荐单位层级列表
-      this.getTechTreeList() //获取技术服务类层级列表
+      //this.getTechTreeList() //获取技术服务类层级列表
       this.getSupplierList() //获取供应方公司列表
       this.getDictOptions()
     },
@@ -450,27 +452,32 @@
       //获取供应方公司列表
       getSupplierList() {
         let _this = this
-        _this.$axios.get('/suppliercertappend/getsupplier/' + '3', {})
+        _this.$axios.get('/suppliercertappend/getsupplier/' + '03', {})
           .then(res => {
             _this.supplierList = res.data
+            console.log("-_this.supplierList---",_this.supplierList)
           })
           .catch(err => {
             console.error(err)
           })
       },
+      chooseAuditorShow() {
+        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
+        this.chooseAuditorVisible = true
+      },
 
       //获取技术服务类层级列表
-      getTechTreeList() {
-        let _this = this
-        this.$axios.get('technologyservice/businesslist', {})
-          .then(res => {
-            _this.optionsList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-            console.log("----this.optionsList--", this.optionsList)
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
+      // getTechTreeList() {
+      //   let _this = this
+      //   this.$axios.get('technologyservice/businesslist', {})
+      //     .then(res => {
+      //       _this.optionsList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+      //       console.log("----this.optionsList--", this.optionsList)
+      //     })
+      //     .catch(err => {
+      //       console.error(err)
+      //     })
+      // },
 
       //获取SupplierId和SupplierCertId
       getInfo(vId) { //这个vId也就是value值
@@ -719,6 +726,7 @@
 
       //更新增项信息
       updateData() {
+        this.formData.SupplierName = this.$refs.suppselect.selectedLabel + ''
         let _this = this
         api2.updateEntity(_this.Id, _this.formData, _this.$axios).then(res => {
           if (res.data.code === 0) {
@@ -763,6 +771,7 @@
 
       //添加增项信息
       addAppend() {
+        this.formData.SupplierName = this.$refs.suppselect.selectedLabel + ''
         let _this = this
         _this.formData.AppendType = '03'
         _this.$axios.post('/suppliercertappend/addappend/', _this.formData)

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

@@ -53,7 +53,7 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="供方名称" sortable min-width="130" align="center"
+        <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
           show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -61,8 +61,8 @@
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
+        <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
@@ -70,45 +70,19 @@
         </el-table-column>
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <!-- <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="复审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert> -->
-            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级复审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待专业科室审核" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="未提交审核" type="info">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级初审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待集中评审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业科室接收" type="success">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待交费" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待入库" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)" title="完成"
-              type="success">
-            </el-alert>
+            <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
+            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+            <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
+            <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
+            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
         </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

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

@@ -52,7 +52,7 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="供方名称" sortable min-width="130" align="center"
+        <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
           show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -60,8 +60,8 @@
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
+        <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
@@ -69,45 +69,19 @@
         </el-table-column>
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <!-- <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="复审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert> -->
-            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级复审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待专业科室审核" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="未提交审核" type="info">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级初审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待集中评审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业科室接收" type="success">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待交费" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待入库" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)" title="完成"
-              type="success">
-            </el-alert>
+            <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
+            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+            <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
+            <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
+            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
         </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>

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

@@ -53,7 +53,7 @@
             {{ jstimehandle(scope.row.ApplyDate) }}
           </template>
         </el-table-column>
-        <el-table-column prop="RecUnitName" label="供方名称" sortable min-width="130" align="center"
+        <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
           show-overflow-tooltip></el-table-column>
         <!-- <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip></el-table-column> -->
         <el-table-column prop="AppendType" label="增项类别" sortable min-width="130" align="center" show-overflow-tooltip>
@@ -61,8 +61,8 @@
             {{ checkAppendType(scope.row.AppendType) }}
           </template>
         </el-table-column>
-        <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
-        </el-table-column>
+        <!-- <el-table-column prop="DenyReason" label="退回原因" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
         <el-table-column prop="AuditDate" label="审核日期" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.AuditDate) }}
@@ -70,45 +70,19 @@
         </el-table-column>
         <el-table-column prop="Status" label="状态标识" sortable min-width="130" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            <!-- <el-alert v-if="scope.row.AuditIndex=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="初审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="复审未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.AuditIndex=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业审核未通过" type="error">
-            </el-alert> -->
-            <el-alert v-if="scope.row.Status=='-1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="审核未通过" type="error">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级复审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待专业科室审核" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="未提交审核" type="info">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待二级初审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待集中评审" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="专业科室接收" type="success">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='6'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待交费" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='7'" :closable="false" style="background:rgba(255,255,255,0.2)"
-              title="待入库" type="warning">
-            </el-alert>
-            <el-alert v-if="scope.row.Status=='8'" :closable="false" style="background:rgba(255,255,255,0.2)" title="完成"
-              type="success">
-            </el-alert>
+            <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
+            <span v-if="scope.row.Status=='1'" style="color:#E6A23C">待初审</span>
+            <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
+            <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
+            <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
+            <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待专业处室分办</span>
+            <span v-if="scope.row.Status=='4'" style="color:#E6A23C">待专业处室审批</span>
+            <span v-if="scope.row.Status=='-4'" style="color:#F56C6C">专业处室审批未通过</span>
+            <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待集中评审</span>
+            <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
+            <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
+            <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
+            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
           </template>
         </el-table-column>
         <el-table-column prop="Remark" label="备注" sortable min-width="130" align="center" show-overflow-tooltip>