页面调整

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

@@ -1032,7 +1032,7 @@ func (this *AnnualAuditController) AnnualAudit() {
 				}else{
 					bFlag="技术服务类"
 				}
-				msg:= "您的"+ bFlag + "年审审核通过，请及时确认交费信息！"
+				msg:= "您的"+ bFlag + "年审审核通过，请及时确认信息并交费！"
 				msgService := msg2.GetMsgService(utils.DBE)
 				msgService.HandleMsg(toMobile,msg,"4-1",list.CreateBy,supplierEntity.ContactName,strconv.Itoa(list.CreateUserId), this.User.Username)
 			} else {

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

@@ -830,4 +830,20 @@ func (this *PaymentInfoController) ReceiveVerifyBillList() {
 	errinfo.Code = 0
 	this.Data["json"] = &errinfo
 	this.ServeJSON()
+}
+
+// @Title 获取权限
+// @Description
+// @Success	200	{object} controllers.Request
+// @router /ispermission [get]
+func (this *PaymentInfoController) IsPermission() {
+	dictList := make(map[string]interface{})
+	svcPerm := permission.GetPermissionService(utils.DBE)
+	isauth := svcPerm.IsAuthorized(this.User.Id, "oil_supplier.PaymentInfo.CanEdit")
+	dictList["IsEdit"] = isauth
+	var errinfo ErrorDataInfo
+	errinfo.Code = 0
+	errinfo.Item = dictList
+	this.Data["json"] = &errinfo
+	this.ServeJSON()
 }

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

@@ -1215,7 +1215,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 					paysvc.InsertEntity(&payinfo)
 					//发短信
 					toMobile := supplierEntity.Mobile
-					msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认交费信息！"
+					msg := "您的" + supplierCertEntity.SupplierTypeName + "准入审核通过，请及时确认信息并交费！"
 					msgService := msg2.GetMsgService(utils.DBE)
 					msgService.HandleMsg(toMobile, msg, "3-1", supplierCertEntity.CreateBy, supplierEntity.ContactName, strconv.Itoa(supplierCertEntity.CreateUserId), this.User.Username)
 

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

@@ -882,7 +882,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 						}else{
 							bFlag="技术服务类"
 						}
-						msg:= "您的"+ bFlag + "增项审核通过，请及时确认交费信息！"
+						msg:= "您的"+ bFlag + "增项审核通过，请及时确认信息并交费！"
 						msgService := msg2.GetMsgService(utils.DBE)
 						msgService.HandleMsg(toMobile,msg,"4-1",supplierCertAppendEntity.CreateBy,supplierEntity.ContactName,strconv.Itoa(supplierCertAppendEntity.CreateUserId), this.User.Username)
 					}

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

@@ -238,7 +238,7 @@ func (this *OilSupplierCertAppendSubController) AddAppendSub() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 2
@@ -353,7 +353,7 @@ func (this *OilSupplierCertAppendSubController) AddTechBus() {
 				entity.SupplierCertSubId = datamain.SupplierCertAppendId
 				entity.NeedFileType = needList[i].FileName
 				entity.FileType = 1
-				entity.EffectDate = time.Now()
+				//entity.EffectDate = time.Now()
 				entity.CreateBy = this.User.Realname
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				entity.SupType = 2
@@ -470,7 +470,7 @@ func (this *OilSupplierCertAppendSubController) AddGoodsBus() {
 				}
 				entity.NeedFileType = needList[i].FileName
 				entity.FileType = 1
-				entity.EffectDate = time.Now()
+				//entity.EffectDate = time.Now()
 				entity.CreateBy = this.User.Realname
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				entity.SupType = 2
@@ -729,7 +729,7 @@ func (this *OilSupplierCertAppendSubController) UpdateManufacturerAppend() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 2
@@ -857,7 +857,7 @@ func (this *OilSupplierCertAppendSubController) UpdateManufacturerAppend() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 2

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

@@ -459,7 +459,7 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 				}
 				entity.NeedFileType = needList[i].FileName
 				entity.FileType = 1
-				entity.EffectDate = time.Now()
+				//entity.EffectDate = time.Now()
 				entity.CreateBy = this.User.Realname
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				entity.SupType = 1
@@ -573,7 +573,7 @@ func (this *OilSupplierCertSubController) AddTechBus() {
 				}
 				entity.NeedFileType = needList[i].FileName
 				entity.FileType = 1
-				entity.EffectDate = time.Now()
+				//entity.EffectDate = time.Now()
 				entity.CreateBy = this.User.Realname
 				entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 				entity.SupType = 1
@@ -692,7 +692,7 @@ func (this *OilSupplierCertSubController) AddBusiness() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 1
@@ -1130,7 +1130,7 @@ func (this *OilSupplierCertSubController) UpdateManufacturer() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 1
@@ -1269,7 +1269,7 @@ func (this *OilSupplierCertSubController) UpdateManufacturer() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 1
@@ -1455,7 +1455,7 @@ func (this *OilSupplierCertSubController) UpdateManufacturers() {
 			}
 			entity.NeedFileType = needList[i].FileName
 			entity.FileType = 1
-			entity.EffectDate = time.Now()
+			//entity.EffectDate = time.Now()
 			entity.CreateBy = this.User.Realname
 			entity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			entity.SupType = 1

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -169,7 +169,7 @@ module.exports = {
     'pages/oilsupplier/infochange/*.*',
     'pages/oilsupplier/infochangech/*.*',
     // 'pages/oilsupplier/supplier/*.*',
-    'pages/oilsupplier/supplierappend/*.*',
+    // 'pages/oilsupplier/supplierappend/*.*',
     'pages/oilsupplier/supplieraudit/*.*',
     'pages/oilsupplier/suppliercert/*.*',
     'pages/oilsupplier/supplierfile/*.*',

src/dashoo.cn/frontend_web/nuxt.config.js

@@ -187,7 +187,7 @@ module.exports = {
     // upfilehost: '/uploadfile',                     //附件上传
     // baseURL:    '/api/',                           //本地工作流图片
     // LOCAL_IP:   '10.76.248.23'                     //定义服务器内网IP,word转PDF时用到
-    // API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
+    // // API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
 
     /* --------Nuxt Start发版用 END-------------- */
   },

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

@@ -72,5 +72,11 @@ export default {
       url: '/paymentinfo/dictlist',
       method: 'GET'
     })
+  },
+  isPermission (myAxios) {
+    return myAxios({
+      url: '/paymentinfo/ispermission',
+      method: 'GET'
+    })
   }
 }

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

@@ -60,7 +60,7 @@
           </el-col> -->
           <el-col :span="12" v-if="SupplierTypeCode == '02' && Title == '新增准入范围'">
             <el-form-item label="名称" required>
-              <el-input placeholder="请选择名称" v-model="BusinessForm.Name" style="width:100%">
+              <el-input placeholder="请选择名称" v-model="BusinessForm.Name" style="width:100%" disabled>
                 <el-button type="primary" style="width:30%" @click="basicDialog = true" slot="append">选择
                 </el-button>
               </el-input>

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

@@ -1,55 +1,59 @@
 <template>
   <div>
+    <!--<el-card class="box-card" style="margin-top: 10px;">-->
+      <!--<div slot="header" class="clearfix">-->
+        <!--<span style="font-weight: bold">准入范围</span>-->
+        <!--<el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"-->
+          <!--v-if="canadd && IsCompanyUser == 0">-->
+          <!--提交审批-->
+        <!--</el-button>-->
+        <!--&lt;!&ndash; <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"-->
+          <!--v-if="canadd && IsCompanyUser == 1">-->
+          <!--提交-->
+        <!--</el-button> &ndash;&gt;-->
+      <!--</div>-->
+      <!--<el-table :data="businessList" size="mini" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange">-->
+        <!--<el-table-column type="selection" width="55"></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="GoodsLevel" label="级别" width="80px" show-overflow-tooltip>-->
+          <!--<template slot-scope="scope">-->
+            <!--<span v-if="scope.row.GoodsLevel=='1'">一级</span>-->
+            <!--<span v-if="scope.row.GoodsLevel=='2'">二级</span>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column-->
+                  <!--label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">-->
+                  <!--<template slot-scope="scope">-->
+                    <!--<el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>-->
+                    <!--<el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>-->
+                    <!--<span v-else>——</span>-->
+                  <!--</template>-->
+        <!--</el-table-column>-->
+        <!--<el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>-->
+            <!--<template slot-scope="scope">-->
+            <!--<span v-if="scope.row.CertSubStatus=='1'"-->
+                  <!--style="color:#67C23A">准入</span>-->
+            <!--<span v-else-if="scope.row.CertSubStatus>'1'"-->
+                  <!--style="color:#E6A23C">暂停</span>-->
+            <!--<span v-else>——</span>-->
+          <!--</template>-->
+        <!--</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, 50, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"-->
+        <!--:total="currentItem_Count">-->
+      <!--</el-pagination>-->
+    <!--</el-card>-->
+
     <el-card class="box-card" style="margin-top: 10px;">
       <div slot="header" class="clearfix">
-        <span style="font-weight: bold">准入范围</span>
+        <span style="font-weight: bold"> 企业资质</span>
         <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
-          v-if="canadd && IsCompanyUser == 0">
+                   v-if="canadd && IsCompanyUser == 0">
           提交审批
         </el-button>
-        <!-- <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
-          v-if="canadd && IsCompanyUser == 1">
-          提交
-        </el-button> -->
-      </div>
-      <el-table :data="businessList" size="mini" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55"></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="GoodsLevel" label="级别" width="80px" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="scope.row.GoodsLevel=='1'">一级</span>
-            <span v-if="scope.row.GoodsLevel=='2'">二级</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-                  label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">
-                  <template slot-scope="scope">
-                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>
-                    <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>
-                    <span v-else>——</span>
-                  </template>
-        </el-table-column>
-        <el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>
-            <template slot-scope="scope">
-            <span v-if="scope.row.CertSubStatus=='1'"
-                  style="color:#67C23A">准入</span>
-            <span v-else-if="scope.row.CertSubStatus>'1'"
-                  style="color:#E6A23C">暂停</span>
-            <span v-else>——</span>
-          </template>
-        </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, 50, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItem_Count">
-      </el-pagination>
-    </el-card>
-
-    <el-card class="box-card" style="margin-top: 10px;">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold"> 企业资质</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
       </div>
       <el-table :data="subfileList" border size="mini">
@@ -87,7 +91,7 @@
     </el-card>
 
     <el-dialog :title="Title" :visible.sync="visible" top="5vh" width="900px">
-      <el-form :model="SubfileForm" label-width="100px">
+      <el-form ref="subfileForm" :model="SubfileForm" label-width="100px">
         <el-row>
           <!-- <el-col :span="12">
             <el-form-item label="资质名称" required>
@@ -108,7 +112,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="有效日期" required>
+            <el-form-item label="有效日期" prop="EffectDate" required :rules="{ type: 'date', required: true, message: '请选择有效日期', trigger: 'change' }">
               <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
               </el-date-picker>
             </el-form-item>
@@ -349,37 +353,41 @@
           })
       },
       makesure () {
-        if (this.Title == '新增文件') {
-          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
-            // 上传附件是否完成判断
-            if (!this.attachissuccess()) {
-              this.$message.error('有附件未成功上传！不能保存数据')
-              return
-            }
-            this.getattachissuccess()
-            this.addSubfile()
-          } else {
-            this.$message({
-              type: 'warning',
-              message: '请上传文件！'
-            })
-          }
-        } else if (this.Title == '上传文件') {
-          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
-            // 上传附件是否完成判断
-            if (!this.attachissuccess()) {
-              this.$message.error('有附件未成功上传！不能保存数据')
-              return
+        this.$refs['subfileForm'].validate((valid) => {
+          if (valid) {
+            if (this.Title == '新增文件') {
+              if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+                // 上传附件是否完成判断
+                if (!this.attachissuccess()) {
+                  this.$message.error('有附件未成功上传！不能保存数据')
+                  return
+                }
+                this.getattachissuccess()
+                this.addSubfile()
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: '请上传文件！'
+                })
+              }
+            } else if (this.Title == '上传文件') {
+              if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+                // 上传附件是否完成判断
+                if (!this.attachissuccess()) {
+                  this.$message.error('有附件未成功上传！不能保存数据')
+                  return
+                }
+                this.getattachissuccess()
+                this.editSubfile()
+              } else {
+                this.$message({
+                  type: 'warning',
+                  message: '请上传文件！'
+                })
+              }
             }
-            this.getattachissuccess()
-            this.editSubfile()
-          } else {
-            this.$message({
-              type: 'warning',
-              message: '请上传文件！'
-            })
           }
-        }
+        })
       },
       addSubfile () {
         let _this = this
@@ -524,7 +532,7 @@
         this.SubfileForm.FileExt = ''
         this.SubfileForm.FileType = ''
         this.SubfileForm.FileName = ''
-        this.SubfileForm.EffectDate = new Date()
+        this.SubfileForm.EffectDate = null
         this.SubfileForm.FileUrl = ''
         this.SubfileForm.OtherRemark = ''
         this.SubfileForm.Remark = ''
@@ -532,6 +540,7 @@
         this.visible = true
       },
       openDialog (val) {
+        console.log(val, '==========')
         this.IsMust = true
         this.Title = '上传文件'
         this.SubfileForm.Id = val.Id
@@ -548,7 +557,7 @@
         this.SubfileForm.FileExt = val.FileExt
         this.SubfileForm.FileType = val.FileType
         this.SubfileForm.FileName = val.FileName
-        this.SubfileForm.EffectDate = new Date(val.EffectDate)
+        this.SubfileForm.EffectDate = (this.jsEffectDate(val.EffectDate))
         this.SubfileForm.FileUrl = val.FileUrl
         this.getwendanginfo(val.FileUrl)
         this.SubfileForm.OtherRemark = val.OtherRemark
@@ -689,6 +698,19 @@
           return val.substring(0, 10)
         }
       },
+      jsEffectDate (val) {
+        if (val === '') {
+          return ''
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return ''
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return ''
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return ''
+        } else {
+          return val
+        }
+      },
       handleCurrentChange (value) {
         this.currentPage = value
         this.getbusList()

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

@@ -97,7 +97,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="营业范围" prop="Business" :rules="{ required: true, message: '营业范围不能为空', trigger: 'blur'}">
+            <el-form-item label="业务范围" prop="Business" :rules="{ required: true, message: '营业范围不能为空', trigger: 'blur'}">
               <el-input v-model="formData.Business"  type="textarea" style="width: 100%" :readonly="!showBtn"></el-input>
             </el-form-item>
           </el-col>

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

@@ -247,10 +247,17 @@
       // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
       // 查询列表
+      this.isPermission()
       this.initDatas()
       this.getDictOptions()
     },
     methods: {
+      isPermission () {
+        api.isPermission(this.$axios).then(res => {
+        }).catch(err => {
+          console.log(err)
+        })
+      },
       savePayInfo () {
         let params = {
           SupplierId: this.addForm.SupplierId,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/paymentinfo/paymentsure.vue

@@ -60,7 +60,7 @@
           </span>
         </span>
       </div>
-      <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+      <el-table :data="entityList" border style="width: 100%" @sort-change="orderby">
         <!--<el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierName" label="企业名称"></el-table-column>-->
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="SupplierTypeName" label="项目类型"></el-table-column>
         <el-table-column sortable min-width="120" align="center" show-overflow-tooltip prop="PayType" label="交费类型">
@@ -202,7 +202,7 @@
         this.dialogVisible = true
       },
       BillSureClickConfirm () {
-        this.$confirm('确认后需要去交费, 是否继续?', '提示', {
+        this.$confirm('请您确认信息准确无误后交费，电子发票将发送至预留电子邮箱，是否继续？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'info'

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

@@ -24,10 +24,10 @@
           </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="commitaudit"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交分办
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/basislist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -158,6 +158,14 @@
             </el-table-column>
             <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
           </el-table>
+          <div style="float: right; margin: 20px;">
+            <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitaudit"
+                       v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
+            </el-button>
+            <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
+                       v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+            </el-button>
+          </div>
         </el-card>
       </div>
     </el-card>

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

@@ -24,10 +24,10 @@
           </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="commitaudit"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交分办
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/goodslist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -212,6 +212,14 @@
             </el-table-column>
             <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
           </el-table>
+          <div style="float: right; margin: 20px;">
+            <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitaudit"
+                       v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
+            </el-button>
+            <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
+                       v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+            </el-button>
+          </div>
         </el-card>
       </div>
     </el-card>

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

@@ -24,10 +24,10 @@
           </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="commitaudit"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审批
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
           </el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
-            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交分办
+            v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
           </el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
@@ -149,6 +149,14 @@
             </el-table-column>
             <el-table-column prop="OtherRemark" label="描述" show-overflow-tooltip></el-table-column>
           </el-table>
+          <div style="float: right; margin: 20px;">
+            <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitaudit"
+                       v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
+            </el-button>
+            <el-button type="primary" size="mini" style="margin-right: 8px" @click="commitfenban"
+                       v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+            </el-button>
+          </div>
         </el-card>
       </div>
     </el-card>
@@ -426,6 +434,7 @@
         organizeOption: [], // 审批部门
         auditerOption: [], // 审批人
         allorgunitOptions: [],
+        InOptions: [],
         orgtreeprops: {
           value: 'Id',
           label: 'CodeName',
@@ -607,7 +616,7 @@
       this.getSupplierList() // 获取供应方公司列表
       this.getDictOptions()
       // this.orgtreeChange(this.majorDept)
-      this.changeOrgUnit(this.selectDept)
+      // this.changeOrgUnit(this.selectDept)
       this.initTableHeader()
     },
     methods: {