添加按钮判断，信息变更修改，年审判断

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

@@ -519,7 +519,7 @@ func (this *AnnualAuditController) AddEntity() {
 	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 {
+	if len(auditentity) >= 1 {
 		errinfo.Message = "今年已提交年审，请勿重复提交！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo

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

@@ -42,9 +42,10 @@ type InfoChangeItemsAll struct {
 	MInfoId        string
 }
 type infoitems struct {
-	SelectItem   string
-	BeChangeInfo string
-	ChangeInfo   string
+	SelectItem     string
+	SelectItemName string
+	BeChangeInfo   string
+	ChangeInfo     string
 }
 
 // @Title 获取实体
@@ -88,7 +89,7 @@ func (this *InfoChangeController) GetAccessCardNo() {
 	var model []suppliercert.OilSupplierCert
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	where := " SupplierId = " + SuppId
-	svc.GetEntitysByOrderbyWhere(OilSupplierCertName, where,"SupplierTypeCode asc", &model)
+	svc.GetEntitysByOrderbyWhere(OilSupplierCertName, where, "SupplierTypeCode asc", &model)
 	var datainfo DataInfo
 	datainfo.Items = model
 	this.Data["json"] = &datainfo
@@ -387,16 +388,16 @@ func (this *InfoChangeController) GetSuppList() {
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var registerUser register.OilCorporateInfo
 	sql := " UserName='" + this.User.Username + "'"
-	svc.GetEntity(&registerUser,sql)
+	svc.GetEntity(&registerUser, sql)
 	//企业用户必须加创建人条件
 	if this.User.IsCompanyUser == 1 {
-		where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
+		where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 	} else {
 		//超级管理员和有查看所有数据权限的用户不加条件
 		svcPerm := permission.GetPermissionService(utils.DBE)
 		isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.marketAccess.AllRecord")
 		if !svcPerm.IsAdmin(this.User.Id) && !isauth {
-			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='"+registerUser.CommercialNo+"')"
+			where = where + " and (b.CreateUserId = '" + this.User.Id + "' or a.CommercialNo='" + registerUser.CommercialNo + "')"
 		}
 	}
 	var list []infochange.SuppModelInfo
@@ -424,7 +425,7 @@ func (this *InfoChangeController) GetAllEntityList() {
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
-		orderby = "a."+Prop
+		orderby = "a." + Prop
 		if Order == "asc" {
 			asc = true
 		}
@@ -436,10 +437,9 @@ func (this *InfoChangeController) GetAllEntityList() {
 		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
 	}
 
-
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var list []infochange.OilUsedName
-	total := svc.GetUsedNameWithOrderBytbl(OilSupplierName,OilInfoChangeName, page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetUsedNameWithOrderBytbl(OilSupplierName, OilInfoChangeName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -564,7 +564,7 @@ func (this *InfoChangeController) GetChangeEntity() {
 		this.Data["json"] = &models
 		this.ServeJSON()
 		return
-	}else {
+	} else {
 		for _, info := range infoitems {
 			fmt.Println(info.SelectItem)
 			fmt.Println(";;;;;;;;;", elem.FieldByName(info.SelectItem).Type().String())
@@ -572,7 +572,7 @@ func (this *InfoChangeController) GetChangeEntity() {
 				intchangeinfo, _ := strconv.ParseInt(info.ChangeInfo, 10, 64)
 				elem.FieldByName(info.SelectItem).SetInt(intchangeinfo)
 			} else if elem.FieldByName(info.SelectItem).Type().String() == "float64" {
-				floatchangeinfo, _ := strconv.ParseFloat(info.ChangeInfo,64)
+				floatchangeinfo, _ := strconv.ParseFloat(info.ChangeInfo, 64)
 				elem.FieldByName(info.SelectItem).SetFloat(floatchangeinfo)
 			} else if elem.FieldByName(info.SelectItem).Type().String() == "time.Time" {
 				t, _ := time.Parse("2006-01-02", info.ChangeInfo)
@@ -743,6 +743,7 @@ func (this *InfoChangeController) AddInfoChangeItemCh() {
 	for i := 0; i < len(model.InfochangeForm); i++ {
 		var infoitementity infochange.OilInfoChangeItem
 		infoitementity.SelectItem = model.InfochangeForm[i].SelectItem
+		infoitementity.SelectItemName = model.InfochangeForm[i].SelectItemName
 		infoitementity.ChangeInfo = model.InfochangeForm[i].ChangeInfo
 		infoitementity.BeChangeInfo = model.InfochangeForm[i].BeChangeInfo
 		infoitementity.ChangeStatus = 0
@@ -1160,7 +1161,7 @@ func (this *InfoChangeController) InfoAudit() {
 			userIds += strconv.Itoa(tmpUser.Id) + ","
 		}
 		userIds = strings.Trim(userIds, ",")
-	}else if infomodel.Status == suppliercert.CENT_AUDIT_STATUS {
+	} else if infomodel.Status == suppliercert.CENT_AUDIT_STATUS {
 		status = suppliercert.ALL_PASE_STATUS
 		step = 3
 		backstatus = suppliercert.NO_THIRD_TRIAL_STATUS
@@ -1186,9 +1187,9 @@ func (this *InfoChangeController) InfoAudit() {
 			infomodel.Status = status
 			itemswhere := "InfoId = " + utils.ToStr(infoid)
 			myerr = svc.UpdateEntityBywheretbl(OilInfoChangeItemName, &infochangeitemmodel, []string{"ChangeStatus"}, itemswhere)
-			myerr = this.updatesupplier(OilSupplierName,dataother.SuppId, infoitems, supmodel)
+			myerr = this.updatesupplier(OilSupplierName, dataother.SuppId, infoitems, supmodel)
 			//资质更新
-			where := "SupplierId = " + utils.ToStr(dataother.SuppId)+" and SupType = 2"
+			where := "SupplierId = " + utils.ToStr(dataother.SuppId) + " and SupType = 2"
 			var supfilemodel supplierfile.OilSupplierFile
 			supfilemodel.SupType = 3
 			svc.UpdateEntityBywheretbl(OilSupplierFileName, &supfilemodel, []string{"SupType"}, where)
@@ -1287,14 +1288,14 @@ func (this *InfoChangeController) InfoAudit() {
 }
 
 //更新供方信息表
-func (this *InfoChangeController) updatesupplier(supname string,suppid int, infoitems []infochange.OilInfoChangeItem, supmodel supplier.OilSupplier) error {
+func (this *InfoChangeController) updatesupplier(supname string, suppid int, infoitems []infochange.OilInfoChangeItem, supmodel supplier.OilSupplier) error {
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var err error
 	if len(infoitems) > 0 {
 		for i := 0; i < len(infoitems); i++ {
 			//var cols []string
 			//cols = append(cols, infoitems[i].SelectItem)
-			where := " Id = "+utils.ToStr(suppid)
+			where := " Id = " + utils.ToStr(suppid)
 			var sql string
 			sql = `UPDATE ` + supname + ` set ` + infoitems[i].SelectItem + ` = ` + infoitems[i].ChangeInfo + ` where ` + where
 			_, err = svc.DBE.Exec(sql)

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

@@ -304,6 +304,7 @@
         visbtn: '1',
         fushenauditer: '', //复审人员
         majorDept: [100000000, 100000128, 100000151],
+        userOptions: [],
         secauditerOptions: [],
         audithistoryshow: false,
         chooseAuditorVisible: false,
@@ -596,10 +597,6 @@
         this.auditerName = name
         this.chooseAuditorVisible = false
       },
-      chooseAuditorShow() {
-        this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
-        this.chooseAuditorVisible = true
-      },
       equipmentdialog() {
         this.$refs["equipmentList"].showDialog()
       },

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

@@ -444,7 +444,7 @@
           if (valid) {
             this.entityForm.auditer = this.auditer
             api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
-              console.log("--22221-",res.data.code)
+              console.log("--22221-", res.data.code)
               if (res.data.code === 0) {
                 //保存成功后，初始化数据，变成修改
                 this.entityForm.Id = res.data.item;
@@ -498,44 +498,51 @@
         });
       },
       addauditcom() {
-        console.log("123456789")
-        api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
-          console.log("--1-",res.data.code)
-          if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
-            this.entityForm.Id = res.data.item;
-            this.initDatas();
-            this.addshow = false
-            this.$router.push({
-              path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
-              query: {
-                certid: this.certId,
-                //WorkflowId: ,
-                Status: 0,
-                Step: 1,
-                annualId: this.entityForm.Id,
+        this.$confirm("确定添加年审, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
+              console.log("--1-", res.data.code)
+              if (res.data.code === 0) {
+                //保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item;
+                this.initDatas();
+                this.addshow = false
+                this.$router.push({
+                  path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
+                  query: {
+                    certid: this.certId,
+                    //WorkflowId: ,
+                    Status: 0,
+                    Step: 1,
+                    annualId: this.entityForm.Id,
+                  }
+                })
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                });
+              } else if (res.data.code === -3) {
+                console.log("--2-", res.data.code)
+                this.$confirm(res.data.message + "，点击继续可继续进行年审")
+                  .then(_ => {
+                    this.addannualdirect()
+                  })
+                  .catch(_ => {});
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                });
               }
-            })
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-          } else if (res.data.code === -3) {
-            console.log("--2-",res.data.code)
-            this.$confirm(res.data.message + "，点击继续可继续进行年审")
-              .then(_ => {
-                this.addannualdirect()
-              })
-              .catch(_ => {});
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
+            }).catch(err => {
+              console.error(err)
             });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
+          })
+          .catch(() => {});
       },
 
       getselectsupplier() {

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

@@ -489,42 +489,49 @@
         this.addshow = true
       },
       addauditcom() {
-        console.log("---this.entityForm-", this.entityForm)
-        api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
-            this.entityForm.Id = res.data.item;
-            this.initDatas();
-            this.addshow = false
-            this.$router.push({
-              path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
-              query: {
-                certid: this.certId,
-                //WorkflowId: ,
-                Status: 0,
-                Step: 1,
-                annualId: this.entityForm.Id,
+        this.$confirm("确定添加年审, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                //保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item;
+                this.initDatas();
+                this.addshow = false
+                this.$router.push({
+                  path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
+                  query: {
+                    certid: this.certId,
+                    //WorkflowId: ,
+                    Status: 0,
+                    Step: 1,
+                    annualId: this.entityForm.Id,
+                  }
+                })
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                });
+              } else if (res.data.code === -3) {
+                this.$confirm(res.data.message + "，点击继续可继续进行年审")
+                  .then(_ => {
+                    this.addannualdirect()
+                  })
+                  .catch(_ => {});
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                });
               }
-            })
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-          } else if (res.data.code === -3) {
-            this.$confirm(res.data.message + "，点击继续可继续进行年审")
-              .then(_ => {
-                this.addannualdirect()
-              })
-              .catch(_ => {});
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
+            }).catch(err => {
+              console.error(err)
             });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
+          })
+          .catch(() => {});
       },
 
       getselectsupplier() {

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

@@ -494,42 +494,50 @@
         this.addshow = true
       },
       addauditcom() {
-        api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
-            this.entityForm.Id = res.data.item;
-            this.initDatas();
-            this.addshow = false
-            this.$router.push({
-              path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
-              query: {
-                certid: this.certId,
-                //WorkflowId: ,
-                Status: 0,
-                Step: 1,
-                annualId: this.entityForm.Id,
-              }
-            })
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
+        this.$confirm("确定添加年审, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            api.addEntity(this.entityForm, this.entityForm.auditer, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                //保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item;
+                this.initDatas();
+                this.addshow = false
+                this.$router.push({
+                  path: '/oilsupplier/annualaudit/' + this.entityForm.SupplierId + '/goodsoperation',
+                  query: {
+                    certid: this.certId,
+                    //WorkflowId: ,
+                    Status: 0,
+                    Step: 1,
+                    annualId: this.entityForm.Id,
+                  }
+                })
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                });
 
-          } else if (res.data.code === -3) {
-            this.$confirm(res.data.message + "，点击继续可继续进行年审")
-              .then(_ => {
-                this.addannualdirect()
-              })
-              .catch(_ => {});
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
+              } else if (res.data.code === -3) {
+                this.$confirm(res.data.message + "，点击继续可继续进行年审")
+                  .then(_ => {
+                    this.addannualdirect()
+                  })
+                  .catch(_ => {});
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                });
+              }
+            }).catch(err => {
+              console.error(err)
             });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
+          })
+          .catch(() => {});
       },
 
       getselectsupplier() {

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

@@ -36,7 +36,8 @@
                   <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
                              :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
             </el-autocomplete> -->
-                  <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" v-model="formData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
+                  <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''"
+                    v-model="formData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
                     v-if="authUser && authUser.Profile.IsCompanyUser == 1">
                   </el-input>
                   <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
@@ -63,12 +64,23 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="16">
+              <el-col :span="8">
+                <el-form-item label="准入方式">
+                  <el-select ref="inStyle" v-model="formData.InStyle"
+                    :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请选择" style="width: 100%"
+                    @change="InStyleChange">
+                    <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
                 <el-form-item label="管理单位">
                   <el-select filterable clearable v-model="formData.MgrUnit" maxlength="255"
-                             :class="changedForm['MgrUnit'] ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
+                    :class="changedForm['MgrUnit'] ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
                     <el-option v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
-                               :value="item.Key">
+                      :value="item.Key">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -87,18 +99,6 @@
                 </el-form-item>
               </el-col>
 
-              <!-- <el-col :span="8">
-              <el-form-item label="准入方式">
-                <el-select ref="inStyle" v-model="formData.InStyle" :disabled="!canUpdateSupplier" placeholder="请选择"
-                  :class="getchange('InStyle') ? 'modified-form-input' : ''" style="width: 100%">
-                  <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-
-
-
               <el-col :span="8">
                 <el-form-item label="中石油准入证编号">
                   <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入"
@@ -107,8 +107,6 @@
                 </el-form-item>
               </el-col>
 
-
-
               <el-col :span="8">
                 <el-form-item label="证件合一">
                   <el-select v-model="formData.CredentialFlag" placeholder="请选择" @change="showorhid" style="width: 100%"
@@ -153,8 +151,8 @@
                   <el-row>
                     <el-col :span="10">
                       <el-cascader :options="countryoptions" :props="countryprops" maxlength="20"
-                        :class="changedForm['Province'] || changedForm['City'] || changedForm['Street'] ? 'modified-form-input' : ''" placeholder="省市区" v-model="CityAry"
-                        style="width: 100%" @change="handleAreaChange">
+                        :class="changedForm['Province'] || changedForm['City'] || changedForm['Street'] ? 'modified-form-input' : ''"
+                        placeholder="省市区" v-model="CityAry" style="width: 100%" @change="handleAreaChange">
                       </el-cascader>
                     </el-col>
                     <el-col :span="14">
@@ -178,8 +176,9 @@
                   <el-row>
                     <el-col :span="10">
                       <el-cascader :options="countryoptions" :props="countryprops"
-                        :class="changedForm['LinkProvince'] || changedForm['LinkCity'] || changedForm['LinkStreet'] ? 'modified-form-input' : ''" placeholder="省市区"
-                        v-model="LinkCityAry" maxlength="20" style="width: 100%" @change="handleLinkAreaChange">
+                        :class="changedForm['LinkProvince'] || changedForm['LinkCity'] || changedForm['LinkStreet'] ? 'modified-form-input' : ''"
+                        placeholder="省市区" v-model="LinkCityAry" maxlength="20" style="width: 100%"
+                        @change="handleLinkAreaChange">
                       </el-cascader>
                     </el-col>
                     <el-col :span="14">
@@ -224,7 +223,8 @@
               <el-col :span="8">
                 <el-form-item label="注册资本" prop="RegCapital">
                   <el-input type="number" v-model="formData.RegCapital" :min="1"
-                    :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
+                    :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
+                    style="width: 100%">
                     <template slot="append">万元</template>
                   </el-input>
                 </el-form-item>
@@ -329,7 +329,8 @@
               <el-col :span="8">
                 <el-form-item label="质量管理体系认证情况及认证机构">
                   <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea"
-                    :class="changedForm['QualitySystemCert'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    :class="changedForm['QualitySystemCert'] ? 'modified-form-input' : ''" style="width: 100%">
+                  </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -345,13 +346,13 @@
                     :class="changedForm['MaunLicense'] ? 'modified-form-input' : ''"></el-input>
                 </el-form-item>
               </el-col>
-              <!-- <el-col :span="8">
+              <el-col :span="8">
                 <el-form-item label="所代理制造商名称">
                   <el-input v-model="formData.AgentManufacturer" maxlength="255" placeholder="请输入" type="textarea"
                     :class="IsModified ? 'modified-form-input' : ''">
                   </el-input>
                 </el-form-item>
-              </el-col> -->
+              </el-col>
 
               <el-col :span="8">
                 <el-form-item label="中石油物资供应商证书">
@@ -605,11 +606,17 @@
     </el-dialog>
     <el-dialog title="变更项查看" :visible.sync="myitemsshow" width="360px">
       <el-table :data="InfoData" border style="width: 100%">
-        <el-table-column align="center" prop="SelectItem" label="变更项目">
+        <el-table-column align="center" prop="SelectItemName" label="变更项目">
         </el-table-column>
         <el-table-column align="center" prop="BeChangeInfo" label="变更前内容">
+          <template slot-scope="scope">
+            {{ dataformat(scope.row) }}
+          </template>
         </el-table-column>
         <el-table-column prop="ChangeInfo" align="center" label="变更后内容">
+          <template slot-scope="scope">
+            {{ dataformat(scope.row) }}
+          </template>
         </el-table-column>
       </el-table>
     </el-dialog>
@@ -1038,6 +1045,7 @@
         infochangeItemList: [],
         infochangeForm: {
           SelectItem: '',
+          SelectItemName: '',
           BeChangeInfo: '',
           ChangeInfo: '',
         },
@@ -1232,13 +1240,13 @@
             this.AccessCardNolist = res.data.items;
             console.log("this.AccessCardNolist", this.AccessCardNolist)
             if (this.AccessCardNolist) {
-              for (var i= 0;i<this.AccessCardNolist.length;i++){
-                if(this.AccessCardNolist[i].SupplierTypeCode == "01"){
-                  this.AccessCardNo1= this.AccessCardNolist[i].AccessCardNo
-                }else if(this.AccessCardNolist[i].SupplierTypeCode == "02"){
-                  this.AccessCardNo2= this.AccessCardNolist[i].AccessCardNo
-                } else if(this.AccessCardNolist[i].SupplierTypeCode == "03"){
-                  this.AccessCardNo3= this.AccessCardNolist[i].AccessCardNo
+              for (var i = 0; i < this.AccessCardNolist.length; i++) {
+                if (this.AccessCardNolist[i].SupplierTypeCode == "01") {
+                  this.AccessCardNo1 = this.AccessCardNolist[i].AccessCardNo
+                } else if (this.AccessCardNolist[i].SupplierTypeCode == "02") {
+                  this.AccessCardNo2 = this.AccessCardNolist[i].AccessCardNo
+                } else if (this.AccessCardNolist[i].SupplierTypeCode == "03") {
+                  this.AccessCardNo3 = this.AccessCardNolist[i].AccessCardNo
                 }
               }
             }
@@ -1414,6 +1422,55 @@
             });
         }
       },
+      InStyleChange (val) {
+        if (val === '2') {
+          this.formData.MgrUnit = '中国石油天然气股份有限公司'
+        }
+      },
+      dataformat(val) {
+        debugger
+        if (val.SelectItem == "SpecTypeCode") {
+          if (val.BeChangeInfo == "1"||val.ChangeInfo == "1"){
+            return "一般外部"
+          }else if (val.BeChangeInfo == "2"||val.ChangeInfo == "2") {
+            return "多元内部"
+          }
+        }else if (val.SelectItem == "InStyle") {
+          if (val.BeChangeInfo == "1"||val.ChangeInfo == "1"){
+            return "评审准入"
+          }else if (val.BeChangeInfo == "2"||val.ChangeInfo == "2") {
+            return "一级物资备案准入"
+          }else if (val.BeChangeInfo == "3"||val.ChangeInfo == "3") {
+            return "二级物资备案准入"
+          }else if (val.BeChangeInfo == "4"||val.ChangeInfo == "4") {
+            return "战略合作准入"
+          }else if (val.BeChangeInfo == "5"||val.ChangeInfo == "5") {
+            return "内部多元准入"
+          }
+        }else if (val.SelectItem == "CredentialFlag") {
+          if (val.BeChangeInfo == "1"||val.ChangeInfo == "1"){
+            return "三证合一"
+          }else if (val.BeChangeInfo == "2"||val.ChangeInfo == "2") {
+            return "五证合一"
+          }else if (val.BeChangeInfo == "3"||val.ChangeInfo == "3") {
+            return "常规"
+          }
+        }else if (val.SelectItem == "SetupTime") {
+          if (val.BeChangeInfo === ''||val.ChangeInfo == "") {
+            return '----'
+          } else if (val.BeChangeInfo === '0001-01-01T08:00:00+08:00'||val.ChangeInfo == "0001-01-01T08:00:00+08:00") {
+            return '----'
+          } else if (val.BeChangeInfo === '5000-01-01T23:59:59+08:00'||val.ChangeInfo == "5000-01-01T23:59:59+08:00") {
+            return '永久'
+          } else {
+            val = val.replace('T', ' ')
+            return val.substring(0, 10)
+          }
+        }
+        else {
+          return
+        }
+      },
       comparevalue(newValue) {
         let _this = this
         _this.infochangeItemList = []
@@ -1425,6 +1482,98 @@
             _this.changedForm[key] = true
             _this.infochangeForm = {}
             _this.infochangeForm.SelectItem = key
+            if (_this.infochangeForm.SelectItem == "SupplierName") {
+              _this.infochangeForm.SelectItemName = "企业名称"
+            } else if (_this.infochangeForm.SelectItem == "OperType") {
+              _this.infochangeForm.SelectItemName = "供应商类型"
+            } else if (_this.infochangeForm.SelectItem == "SpecTypeCode") {
+              _this.infochangeForm.SelectItemName = "单位关系"
+            } else if (_this.infochangeForm.SelectItem == "Country") {
+              _this.infochangeForm.SelectItemName = "国家"
+            } else if (_this.infochangeForm.SelectItem == "InStyle") {
+              _this.infochangeForm.SelectItemName = "准入方式"
+            } else if (_this.infochangeForm.SelectItem == "MgrUnit") {
+              _this.infochangeForm.SelectItemName = "管理单位"
+            } else if (_this.infochangeForm.SelectItem == "PACNumber") {
+              _this.infochangeForm.SelectItemName = "中石油准入证编号"
+            } else if (_this.infochangeForm.SelectItem == "CredentialFlag") {
+              _this.infochangeForm.SelectItemName = "证件合一"
+            } else if (_this.infochangeForm.SelectItem == "CommercialNo") {
+              _this.infochangeForm.SelectItemName = "统一社会信用代码"
+            } else if (_this.infochangeForm.SelectItem == "CountryTaxNo") {
+              _this.infochangeForm.SelectItemName = "税务登记证编号"
+            } else if (_this.infochangeForm.SelectItem == "OrganCode") {
+              _this.infochangeForm.SelectItemName = "组织机构代码"
+            } else if (_this.infochangeForm.SelectItem == "Address") {
+              _this.infochangeForm.SelectItemName = "注册地址"
+            } else if (_this.infochangeForm.SelectItem == "Province") {
+              _this.infochangeForm.SelectItemName = "省直辖市"
+            } else if (_this.infochangeForm.SelectItem == "City") {
+              _this.infochangeForm.SelectItemName = "地市区县"
+            } else if (_this.infochangeForm.SelectItem == "Street") {
+              _this.infochangeForm.SelectItemName = "街道"
+            } else if (_this.infochangeForm.SelectItem == "LinkAddress") {
+              _this.infochangeForm.SelectItemName = "通信地址-单位地址"
+            } else if (_this.infochangeForm.SelectItem == "LinkProvince") {
+              _this.infochangeForm.SelectItemName = "通信地址-省直辖市"
+            } else if (_this.infochangeForm.SelectItem == "LinkCity") {
+              _this.infochangeForm.SelectItemName = "通信地址-地市区县"
+            } else if (_this.infochangeForm.SelectItem == "LinkStreet") {
+              _this.infochangeForm.SelectItemName = "通信地址-街道"
+            } else if (_this.infochangeForm.SelectItem == "ZipCode") {
+              _this.infochangeForm.SelectItemName = "邮编"
+            } else if (_this.infochangeForm.SelectItem == "LinkZipCode") {
+              _this.infochangeForm.SelectItemName = "通信地址-邮编"
+            } else if (_this.infochangeForm.SelectItem == "LegalPerson") {
+              _this.infochangeForm.SelectItemName = "法定代表人姓名"
+            } else if (_this.infochangeForm.SelectItem == "CompanyType") {
+              _this.infochangeForm.SelectItemName = "公司类型"
+            } else if (_this.infochangeForm.SelectItem == "SetupTime") {
+              _this.infochangeForm.SelectItemName = "成立时间"
+            } else if (_this.infochangeForm.SelectItem == "RegCapital") {
+              _this.infochangeForm.SelectItemName = "注册资本"
+            } else if (_this.infochangeForm.SelectItem == "Currency") {
+              _this.infochangeForm.SelectItemName = "币种"
+            } else if (_this.infochangeForm.SelectItem == "币种") {
+              _this.infochangeForm.SelectItemName = "开户银行"
+            } else if (_this.infochangeForm.SelectItem == "ContactName") {
+              _this.infochangeForm.SelectItemName = "联系人姓名"
+            } else if (_this.infochangeForm.SelectItem == "Mobile") {
+              _this.infochangeForm.SelectItemName = "移动电话"
+            } else if (_this.infochangeForm.SelectItem == "BankAccount") {
+              _this.infochangeForm.SelectItemName = "银行账号"
+            } else if (_this.infochangeForm.SelectItem == "Telphone") {
+              _this.infochangeForm.SelectItemName = "固定电话"
+            } else if (_this.infochangeForm.SelectItem == "Fax") {
+              _this.infochangeForm.SelectItemName = "传真"
+            } else if (_this.infochangeForm.SelectItem == "CompanyTel") {
+              _this.infochangeForm.SelectItemName = "财务电话"
+            } else if (_this.infochangeForm.SelectItem == "EMail") {
+              _this.infochangeForm.SelectItemName = "电子邮箱"
+            } else if (_this.infochangeForm.SelectItem == "BankCreditRating") {
+              _this.infochangeForm.SelectItemName = "银行信用等级"
+            } else if (_this.infochangeForm.SelectItem == "HseTraining") {
+              _this.infochangeForm.SelectItemName = "HSE审查培训"
+            } else if (_this.infochangeForm.SelectItem == "QualitySystemCert") {
+              _this.infochangeForm.SelectItemName = "质量管理体系认证情况及认证机构"
+            } else if (_this.infochangeForm.SelectItem == "ProductQualityCert") {
+              _this.infochangeForm.SelectItemName = "产品质量认证情况及认证机构"
+            } else if (_this.infochangeForm.SelectItem == "MaunLicense") {
+              _this.infochangeForm.SelectItemName = "生产/制造许可证获证情况及编号"
+            } else if (_this.infochangeForm.SelectItem == "MaunAgent") {
+              _this.infochangeForm.SelectItemName = "所代理制造商名称"
+            } else if (_this.infochangeForm.SelectItem == "SupplierCertificate") {
+              _this.infochangeForm.SelectItemName = "中石油物资供应商证书"
+            } else if (_this.infochangeForm.SelectItem == "SafetyLicense") {
+              _this.infochangeForm.SelectItemName = "安全生产许可证"
+            } else if (_this.infochangeForm.SelectItem == "SpecIndustryCert") {
+              _this.infochangeForm.SelectItemName = "行业特殊要求的认证证书"
+            } else if (_this.infochangeForm.SelectItem == "BusinessScope") {
+              _this.infochangeForm.SelectItemName = "营业范围"
+            } else if (_this.infochangeForm.SelectItem == "Remark") {
+              _this.infochangeForm.SelectItemName = "备注"
+            }
+
             _this.infochangeForm.ChangeInfo = value
             _this.infochangeForm.BeChangeInfo = _this.copyformdata[key]
             _this.infochangeItemList.push(_this.infochangeForm)
@@ -1645,12 +1794,13 @@
       },
       //保存信息变更数据
       saveinfochange() {
+        console.log("----",this.CityAry)
         let AllInfochangeItemList = {
           SupplierId: this.serviceId,
           MInfoId: this.MInfoId,
           InfochangeForm: this.infochangeItemList
         }
-
+        console.log("----",this.infochangeItemList)
         api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1822,6 +1972,7 @@
     .el-input__inner {
       background-color: wheat;
     }
+
     .el-textarea__inner {
       background-color: wheat;
     }

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

@@ -398,31 +398,39 @@
         }
       },
       addInfoChangeCom() {
-        api.addInfoChMain(this.entityForm, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            //保存成功后，初始化数据，变成修改
-            this.entityForm.Id = res.data.item;
-            this.$router.push({
-              path: '/oilsupplier/infochangech/' + this.entityForm.SupplierId + '/operation',
-              query: {
-                InfoStatus: 0,
-                infoId: this.entityForm.Id ,
-              }
-            })
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
+        this.$confirm("确定添加变更申请, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            api.addInfoChMain(this.entityForm, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                //保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item;
+                this.$router.push({
+                  path: '/oilsupplier/infochangech/' + this.entityForm.SupplierId + '/operation',
+                  query: {
+                    InfoStatus: 0,
+                    infoId: this.entityForm.Id,
+                  }
+                })
+                this.$message({
+                  type: 'success',
+                  message: res.data.message
+                });
 
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: res.data.message
+                });
+              }
+            }).catch(err => {
+              console.error(err)
             });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
+          })
+          .catch(() => {});
       },
       addInfoChange() {
         this.$refs['EntityFormref'].validate((valid) => {

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

@@ -12,9 +12,11 @@
           </span>
           <span style="float: right;">
             <router-link :to="'/oilsupplier/supplierappend/2/basisdataopera'">
-              <el-button v-if="IsCompanyUser == 0" 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 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">
@@ -63,7 +65,7 @@
           </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="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.ApplyDate) }}
             </template>
@@ -241,8 +243,8 @@
           children: 'children'
         },
         IsCompanyUser: 0,
-        supplierList:[],
-        suplen:1,
+        supplierList: [],
+        suplen: 1,
         appendformData: {
           Id: '',
           Step: 1,
@@ -297,35 +299,41 @@
 
       addappendcom() {
         let _this = this
-        _this.appendformData.AppendType = '02'
-        console.log("----this.appendformData--",this.appendformData)
-        _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.$confirm("确定添加变更申请, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            _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
+                  })
                 }
               })
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
+              .catch(err => {
+                console.error(err)
               })
-            }
           })
-          .catch(err => {
-            console.error(err)
-          })
-
+          .catch(() => {});
       },
 
       getSupplierList() {
@@ -334,12 +342,14 @@
         let params = {
           SuppTypeCode: '02',
         }
-        _this.$axios.get('/suppliercertappend/getsupplier', {params})
+        _this.$axios.get('/suppliercertappend/getsupplier', {
+            params
+          })
           .then(res => {
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
-            }else{
+            } else {
               _this.suplen = 0
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {

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

@@ -7,20 +7,22 @@
       </el-breadcrumb>
       <el-card class="box-card" style="height: calc(100vh - 115px);">
         <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 物资类列表
-        </span>
+          <span>
+            <i class="icon icon-table2"></i> 物资类列表
+          </span>
           <span style="float: right;">
-          <router-link :to="'/oilsupplier/supplierappend/1/goodsdataopera'">
-            <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">添加
+            <router-link :to="'/oilsupplier/supplierappend/1/goodsdataopera'">
+              <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>
+          </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
             <el-form-item label="上报时间">
               <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
             <el-form-item>
               <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -33,7 +35,8 @@
             </el-form-item>
           </el-form>
         </div>
-        <el-table :data="entityList" border height="calc(100vh - 243px)" size="mini" style="width: 100%" @sort-change="orderby">
+        <el-table :data="entityList" border height="calc(100vh - 243px)" size="mini" style="width: 100%"
+          @sort-change="orderby">
           <el-table-column label="操作" min-width="150" align="center" fixed="right">
             <template slot-scope="scope">
               <el-button type="primary" title="编辑" size="mini" plain @click="editData(scope.row)">打开</el-button>
@@ -43,7 +46,8 @@
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item :command="GetCommand('History', scope.row)">审批流程</el-dropdown-item>
-                  <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0" divided>
+                  <el-dropdown-item :command="GetCommand('Delete', scope.row.Id)" :disabled="scope.row.Status != 0"
+                    divided>
                     删除数据</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -52,7 +56,7 @@
           </el-table-column>
 
           <el-table-column prop="SupplierName" label="供方名称" sortable min-width="130" align="center"
-                           show-overflow-tooltip></el-table-column>
+            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 width="150" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -94,8 +98,8 @@
 
         </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">
+          :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+          :total="currentItemCount">
         </el-pagination>
       </el-card>
 
@@ -106,7 +110,7 @@
             <el-col :span="24">
               <el-form-item label="时间范围">
                 <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                                start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+                  start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
             </el-col>
 
@@ -155,9 +159,9 @@
           </el-row>
         </el-form>
         <span slot="footer" class="dialog-footer">
-        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
-        <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
-      </span>
+          <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+          <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
+        </span>
       </el-dialog>
       <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
         <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
@@ -241,8 +245,8 @@
           children: 'children'
         },
         IsCompanyUser: 0,
-        supplierList:[],
-        suplen:1,
+        supplierList: [],
+        suplen: 1,
         appendformData: {
           Id: '',
           Step: 1,
@@ -297,35 +301,41 @@
 
       addappendcom() {
         let _this = this
-        _this.appendformData.AppendType = '01'
-        console.log("------",this.appendformData)
-        _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.$confirm("确定添加变更申请, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            _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
+                  })
                 }
               })
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
+              .catch(err => {
+                console.error(err)
               })
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
           })
-          .catch(err => {
-            console.error(err)
-          })
-
+          .catch(() => {});
       },
 
       getSupplierList() {
@@ -334,12 +344,14 @@
         let params = {
           SuppTypeCode: '01',
         }
-        _this.$axios.get('/suppliercertappend/getsupplier', {params})
+        _this.$axios.get('/suppliercertappend/getsupplier', {
+            params
+          })
           .then(res => {
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
-            }else{
+            } else {
               _this.suplen = 0
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {

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

@@ -65,7 +65,7 @@
           </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="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
+          <el-table-column prop="ApplyDate" label="申请日期" sortable min-width="130" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ jstimehandle(scope.row.ApplyDate) }}
             </template>
@@ -300,35 +300,41 @@
 
       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/techdataopera`,
-                query: {
-                  Id: AppendId,
-                  editFlag: 1 //编辑标记： 1 修改，0 不修改
+        _this.$confirm("确定添加变更申请, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            _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
+                  })
                 }
               })
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
+              .catch(err => {
+                console.error(err)
               })
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
           })
-          .catch(err => {
-            console.error(err)
-          })
-
+          .catch(() => {});
       },
 
       getSupplierList() {
@@ -337,12 +343,14 @@
         let params = {
           SuppTypeCode: '03',
         }
-        _this.$axios.get('/suppliercertappend/getsupplier', {params})
+        _this.$axios.get('/suppliercertappend/getsupplier', {
+            params
+          })
           .then(res => {
             _this.supplierList = res.data
             if (_this.supplierList) {
               _this.suplen = _this.supplierList.length
-            }else{
+            } else {
               _this.suplen = 0
             }
             if (_this.IsCompanyUser == 1 && _this.supplierList) {