不良记录查看

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercert.go

@@ -30,7 +30,7 @@ type OilSupplierCert struct {
 	MgrUnit           string    `xorm:"comment('管理单位') VARCHAR(255)"`
 	AddinTime         string    `xorm:"comment('准入日期') VARCHAR(255)"`
 	EffectTime        string    `xorm:"comment('生效日期') VARCHAR(255)"`
-	ApplyTime         time.Time `xorm:"comment('年审到期日期') VARCHAR(255)"`
+	ApplyTime         time.Time `xorm:"comment('年审到期日期') DATETIME"`
 	SupplierNo        string    `xorm:"comment('供应商准入证编号') VARCHAR(255)"`
 	MdmFlag           string    `xorm:"default '0' comment('MDM标志') VARCHAR(2)"`
 	InternalFlag      string    `xorm:"comment('国内采购') VARCHAR(255)"`

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

@@ -518,6 +518,7 @@
                                  align="center"></el-table-column>
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
+                                 width="160px"
                                  align="center">
                   <template slot-scope="scope">
                     <el-button type="success" size="mini" v-if="scope.row.CertSubStatus=='1'" @click="changeCertSubStatus(scope.row)">准入</el-button>
@@ -557,6 +558,7 @@
                                  show-overflow-tooltip></el-table-column>
                 <el-table-column prop="CertSubStatus"
                                  label="状态"
+                                 width="160px"
                                  align="center"
                                  show-overflow-tooltip>
                   <template slot-scope="scope">

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

@@ -66,13 +66,13 @@
         <!-- 增项分类列表 -->
         <el-row :gutter="2">
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
               <div slot="header">
                 <span><i class="icon icon-table2"></i> 全部准入范围</span>
                 <!-- <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" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="entityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @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)"
@@ -93,13 +93,13 @@
           <el-col :span="12">
             <!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
             :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
-            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
               <div slot="header">
                 <span><i class="icon icon-table2"></i> 新增准入范围</span>
                 <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="myentityList" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="myentityList" size="mini" border style="width: 100%" height="calc(100vh - 428px)" @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)"
@@ -136,7 +136,7 @@
             <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"
+                  <a :href="fileurlcut(scope.row.FileUrl, index)" target="_blank"
                     class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
                 </div>
               </template>
@@ -188,7 +188,7 @@
     </el-dialog>
     <!-- 增项分类添加、修改 -->
     <el-dialog title="添加" :visible.sync="dialogVisible">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
+      <el-form label-width="150px" v-loading="dialogloading" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row>
           <el-col :span="12">
             <el-form-item label="分类名称" prop="Name">
@@ -520,6 +520,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
           AppendType: '02', // 增项类别(01 物资类，02 基建类，03 技术服务类)
           Remark: '' // 备注
         },
+        dialogloading: false,
         dialogVisible: false, // 增项分类dialog
         dialogFormData: {
           Id: '',
@@ -840,7 +841,15 @@ import fileapi from '@/api/oilsupplier/supplierfile'
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let fullUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && (fullUrl.indexOf('upfile') === 0 || fullUrl.indexOf('/upfile') === 0)) {
+          const myDomain = window.location.host
+          fullUrl = 'http://' + myDomain + '/' + fullUrl
+        } else {
+          fullUrl = 'http://' + fullUrl
+        }
+        return fullUrl
       },
       commitaudit () {
         if (this.subfileList && this.subfileList.length > 0) {
@@ -1225,6 +1234,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
             _this.dialogFormData.SupplierId = _this.formData.SupplierId
             _this.dialogFormData.SupplierCertId = _this.formData.SupplierCertId
             _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
+            _this.dialogloading = true
             _this.addSortAppend()
           } else {
             return false
@@ -1249,6 +1259,7 @@ import fileapi from '@/api/oilsupplier/supplierfile'
         this.dialogFormData.SupplierTypeCode = '02'
         this.$axios.post('/suppliercertappendsub/addappendsub/', this.dialogFormData)
           .then(res => {
+            this.dialogloading = false
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',

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

@@ -73,13 +73,13 @@
         <!-- 增项分类列表 -->
         <el-row :gutter="2">
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
               <div slot="header">
                 <span><i class="icon icon-table2"></i> 全部准入范围</span>
                 <!-- <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" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="entityList" size="mini" border style="width: 100%;"  height="calc(100vh - 428px)" @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)"
@@ -100,13 +100,13 @@
           <el-col :span="12">
             <!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
             :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
-            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
               <div slot="header">
                 <span><i class="icon icon-table2"></i> 新增准入范围</span>
                 <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="myentityList" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="myentityList" size="mini" border style="width: 100%;"  height="calc(100vh - 428px)" @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)"
@@ -143,7 +143,7 @@
             <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"
+                  <a :href="fileurlcut(scope.row.FileUrl, index)" target="_blank"
                     class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
                 </div>
               </template>
@@ -200,7 +200,7 @@
     </el-dialog>
     <!-- 增项分类添加、修改 -->
     <el-dialog :title="dialogTitle" :visible.sync="dialogVisible">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
+      <el-form label-width="150px" v-loading="dialogloading" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row style="margin-top: -10px">
           <el-col :span="12">
             <el-input v-if="!switchstatus" v-model="filterText" placeholder="请输入名称或代码" size="mini"
@@ -543,6 +543,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
           AppendType: '', // 增项类别(01 物资类，02 基建类，03 技术服务类)
           Remark: '' // 备注
         },
+        dialogloading: false,
         dialogVisible: false, // 增项分类dialog
         dialogTitle: '',
         dialogFormData: {
@@ -938,7 +939,15 @@ import uploadajax from '@/assets/js//uploadajax.js'
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let fullUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && (fullUrl.indexOf('upfile') === 0 || fullUrl.indexOf('/upfile') === 0)) {
+          const myDomain = window.location.host
+          fullUrl = 'http://' + myDomain + '/' + fullUrl
+        } else {
+          fullUrl = 'http://' + fullUrl
+        }
+        return fullUrl
       },
       openDialog (val) {
         this.SubfileForm.Id = val.Id
@@ -1266,6 +1275,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
 
       // 确定
       ensureOption () {
+        this.dialogloading = true
         let _this = this
         let arr = []
         let val1 = this.$refs.orgmanagetree.getCheckedNodes()
@@ -1336,6 +1346,7 @@ import uploadajax from '@/assets/js//uploadajax.js'
         }
         _this.$axios.post('/suppliercertappendsub/addgoodsbus/', params)
           .then(res => {
+            _this.dialogloading = false
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',

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

@@ -76,11 +76,11 @@
          <!-- 增项分类列表 -->
         <el-row :gutter="2">
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
               <div slot="header">
                 <span><i class="icon icon-table2"></i> 全部准入范围</span>
               </div>
-              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="entityList" size="mini" border style="width: 100%;" height="calc(100vh - 428px)" @sort-change="orderby">
                 <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>
@@ -88,13 +88,13 @@
             </el-card>
           </el-col>
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);">
               <div slot="header">
                 <span><i class="icon icon-table2"></i> 新增准入范围</span>
                 <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="myentityList" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="myentityList" size="mini" border style="width: 100%;" height="calc(100vh - 428px)" @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)"
@@ -127,7 +127,7 @@
             <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"
+                  <a :href="fileurlcut(scope.row.FileUrl, index)" target="_blank"
                     class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
                 </div>
               </template>
@@ -184,7 +184,7 @@
     </el-dialog>
     <!-- 增项分类添加、修改 -->
     <el-dialog title="添加" :visible.sync="dialogVisible">
-      <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
+      <el-form label-width="150px" ref="dialogFormData" v-loading="dialogloading" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row style="margin-top: -10px">
           <el-col :span="12">
             <el-input v-model="keyword" placeholder="请输入名称或代码" size="mini" style="width: 250px;"></el-input>
@@ -502,6 +502,7 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
           AppendType: '', // 增项类别(01 物资类，02 基建类，03 技术服务类)
           Remark: '' // 备注
         },
+        dialogloading: false,
         dialogVisible: false, // 增项分类dialog
         dialogFormData: {
           Id: '',
@@ -897,7 +898,15 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')
-        return fileurl[0]
+        let fullUrl = fileurl[0]
+        // 内网服务器专用
+        if (process.client && (fullUrl.indexOf('upfile') === 0 || fullUrl.indexOf('/upfile') === 0)) {
+          const myDomain = window.location.host
+          fullUrl = 'http://' + myDomain + '/' + fullUrl
+        } else {
+          fullUrl = 'http://' + fullUrl
+        }
+        return fullUrl
       },
       openDialog (val) {
         this.SubfileForm.Id = val.Id
@@ -1150,6 +1159,7 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 
       // 确定
       ensureOption () {
+        this.dialogloading = true
         let arr = []
         let val = this.$refs.orgmanagetree.getCheckedNodes()
         this.checkList = []
@@ -1196,10 +1206,12 @@ import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
             type: 'warning',
             message: '名称不能为空，请选择分类！'
           })
+          _this.dialogloading = false
           return
         }
         _this.$axios.post('/suppliercertappendsub/addtechbus/', params)
           .then(res => {
+            _this.dialogloading = false
             if (res.data.code === 0) {
               _this.$message({
                 type: 'success',

src/dashoo.cn/frontend_web/src/pages/select/badrecordselect/index.vue

@@ -472,6 +472,7 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>
+                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" style="margin-left: 5px" circle @click="showBackReasonList(scope.row)"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -509,6 +510,7 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>
+                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" style="margin-left: 5px" circle @click="showBackReasonList(scope.row)"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -546,6 +548,7 @@
                     <span v-else-if="scope.row.CertSubStatus>'1'"
                           style="color:#E6A23C">暂停</span>
                     <span v-else>——</span>
+                    <el-button type="plain" plain size="mini" icon="el-icon-star-off" style="margin-left: 5px" circle @click="showBackReasonList(scope.row)"></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -577,6 +580,29 @@
       </el-tabs>
     </el-dialog>
 
+    <el-dialog title="准入变化历史"
+               stripe
+               :visible.sync="showBackReason"
+               width="800px">
+      <el-table :data="backReasonList">
+        <el-table-column width="80" property="CertSubStatus" label="状态">
+          <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 width="150" property="CreateOn" label="操作时间">
+          <template slot-scope="scope">
+            {{ jstimehandle(scope.row.CreateOn+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column mini-width="120" property="BackReason" label="原因"></el-table-column>
+      </el-table>
+    </el-dialog>
+
     <!-- 编辑框（默认隐藏） -->
     <!-- <el-dialog title="企业不良行为编辑"
                :visible.sync="editshow"
@@ -864,6 +890,7 @@
 
 <script>
 import setapi from '@/api/oilsupplier/oilclassorgset'
+import backReasonApi from '@/api/oilsupplier/supplierpausereason'
 export default {
   created () {
     // 执行初始化方法
@@ -872,6 +899,8 @@ export default {
   },
   data () {
     return {
+      showBackReason: false,
+      backReasonList: [],
       isChooseDisable: false,
       addShowTitle: '不良行为添加',
       wzFlag: false,
@@ -1520,6 +1549,19 @@ export default {
           console.error(err)
         })
     },
+    showBackReasonList (row) {
+      //分页及列表条件
+      let params = {
+        CertSubId: row.Id
+      }
+      //访问接口
+      backReasonApi.getNoPageList(params, this.$axios).then(res => {
+        this.backReasonList = res.data.items
+        this.showBackReason = true
+      }).catch(err => {
+        console.error(err)
+      })
+    },
     // 初始化列表方法
     initDatas (event) {
       if (event != null) {