Explorar el Código

不良记录

Signed-off-by: lijunqing <lijunqing@dashoo.cn>
lijunqing hace 6 años
padre
commit
b458a17ab0

+ 28 - 14
src/dashoo.cn/backend/api/controllers/oilsupplier/badrecord.go

@@ -1,6 +1,7 @@
 package oilsupplier
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"encoding/json"
 	"fmt"
 	"strconv"
@@ -103,9 +104,9 @@ func (this *BadRecordController) AddBadRecord() {
 
 	//判断名称是否已拥有
 	var companyCode = model.Companycode
-	var categoryCode = model.Categorycode
+	//var categoryCode = model.Categorycode
 
-	where := "1=1 and CompanyCode='" + companyCode + "' and categoryCode='" + categoryCode + "'"
+	where := "1=1 and CompanyCode='" + companyCode + "'"
 	total := svc.GetName(BaseBadRecord, where)
 	if total != 0 {
 		errinfo.Message = "已有重复数据"
@@ -113,22 +114,21 @@ func (this *BadRecordController) AddBadRecord() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
-		var Categorycode = model.Categorycode
-
-		if Categorycode == "01" {
-			model.Categoryname = "物资类"
-		} else if Categorycode == "02" {
-			model.Categoryname = "基建类"
-		} else {
-			model.Categoryname = "技术服务类"
-		}
+		//var Categorycode = model.Categorycode
+		//
+		//if Categorycode == "01" {
+		//	model.Categoryname = "物资类"
+		//} else if Categorycode == "02" {
+		//	model.Categoryname = "基建类"
+		//} else {
+		//	model.Categoryname = "技术服务类"
+		//}
 		var result []map[string]string
 		sql := "select SupplierName from " + OilSupplierName + " where id =" + model.Companycode + ""
 		result, _ = svc.DBE.QueryString(sql)
 
 		fmt.Println(result[0]["SupplierName"])
-		model.Bak3 = "1"
-		model.Bak4 = "——"
+		//model.Bak4 = "——"
 		model.Companyname = result[0]["SupplierName"]
 		model.Createon = time.Now()
 		model.Createby = this.User.Realname
@@ -136,6 +136,13 @@ func (this *BadRecordController) AddBadRecord() {
 
 		_, err := svc.InsertEntityBytbl(BaseBadRecord, &model)
 
+		//更新准入表状态
+
+		var supplierCert suppliercert.OilSupplierCert
+		supplierCert.InFlag=model.Bak3
+		cols := []string{ "InFlag"}
+		svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols,"SupplierId='"+model.Companycode+"'")
+
 		if err == nil {
 			//新增
 			errinfo.Message = "添加成功!"
@@ -214,9 +221,16 @@ func (this *BadRecordController) UpdateBadRecordById() {
 	model.Modifiedby = this.User.Realname
 	model.Modifieduserid, _ = utils.StrTo(this.User.Id).Int()
 
-	cols = []string{"Record", "Bak2", "Modifiedon", "Modifieduserid", "Modifiedby"}
+	cols = []string{"Record", "Bak2", "Bak3", "Modifiedon", "Modifieduserid", "Modifiedby"}
 
 	err := svc.UpdateEntityBytbl(BaseBadRecord, id, &model, cols)
+
+
+	var supplierCert suppliercert.OilSupplierCert
+	supplierCert.InFlag=model.Bak3
+	cols1:= []string{ "InFlag"}
+	svc.UpdateEntityBywheretbl(OilSupplierCertName,&supplierCert, cols1,"SupplierId='"+model.Companycode+"'")
+
 	if err == nil {
 		errinfo.Message = "修改成功!"
 		errinfo.Code = 0

+ 338 - 167
src/dashoo.cn/frontend_web/src/pages/oilsupplier/badrecord/index.vue

@@ -7,22 +7,23 @@
     </el-breadcrumb>
 
     <!--内框顶部显示-->
-    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
+    <el-card class="box-card"
+             style="height: calc(100vh - 115px);position:relative">
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 不良行为记录
         </span>
-        <el-form
-          :model="searchForm"
-          ref="searchformRef"
-          :inline="true"
-          style="float: right; margin-top: -5px"
-        >
+        <el-form :model="searchForm"
+                 ref="searchformRef"
+                 :inline="true"
+                 style="float: right; margin-top: -5px">
           <el-form-item label="企业名称">
-            <el-input size="mini" v-model="searchForm.Companyname" placeholder="请输入内容"></el-input>
+            <el-input size="mini"
+                      v-model="searchForm.Companyname"
+                      placeholder="请输入内容"></el-input>
           </el-form-item>
 
-          <el-form-item label="准入类别">
+          <!-- <el-form-item label="准入类别">
             <el-select
               size="mini"
               style="width:150px"
@@ -34,17 +35,15 @@
               <el-option label="基建类" value="02"></el-option>
               <el-option label="技术服务类" value="03"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item>
-            <el-dropdown
-              split-button
-              type="primary"
-              style="margin-left:8px;"
-              size="mini"
-              @click="initDatas($event)"
-              @command="searchCommand"
-            >
+            <el-dropdown split-button
+                         type="primary"
+                         style="margin-left:8px;"
+                         size="mini"
+                         @click="initDatas($event)"
+                         @command="searchCommand">
               查询
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="clear">查询重置</el-dropdown-item>
@@ -52,84 +51,121 @@
             </el-dropdown>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" size="mini" @click="addaudit">添加</el-button>
+            <el-button type="primary"
+                       size="mini"
+                       @click="addaudit">添加</el-button>
           </el-form-item>
         </el-form>
       </div>
 
       <!--内框表格显示-->
-      <el-table
-        size="mini"
-        :data="entityList"
-        border
-        height="calc(100vh - 243px)"
-        style="width: 100%"
-      >
+      <el-table size="mini"
+                :data="entityList"
+                border
+                height="calc(100vh - 243px)"
+                style="width: 100%">
         <!--内框表格剩余栏显示-->
-        <el-table-column label="企业名称" prop="Companyname" align="center" width="260px"></el-table-column>
-        <el-table-column label="类别名称" prop="Categoryname" align="center" width="100px"></el-table-column>
-        <el-table-column label="不良行为时间" prop="Bak2" align="center" width="100px">
+        <el-table-column label="企业名称"
+                         prop="Companyname"
+                         align="center"
+                         width="260px"></el-table-column>
+        <!-- <el-table-column label="类别名称" prop="Categoryname" align="center" width="100px"></el-table-column> -->
+
+        <el-table-column label="不良行为"
+                         prop="Record"
+                         align="center"></el-table-column>
+        <el-table-column label="不良行为时间"
+                         prop="Bak2"
+                         align="center"
+                         width="200px">
           <template slot-scope="scope">{{changeVal(scope.row.Bak2) }}</template>
         </el-table-column>
-        <el-table-column label="不良行为" prop="Record" align="center" width="600px"></el-table-column>
-        <el-table-column label="状态" align="center" width="100px">
+
+        <!-- <el-table-column label="恢复时间" prop="Bak4" align="center" width="100px"></el-table-column> -->
+        <el-table-column label="录入时间"
+                         prop="Createon"
+                         align="center"
+                         width="100px">
           <template slot-scope="scope">
-            <span v-if="scope.row.Bak3=='1'" style="color:#67C23A">有效</span>
-            <span v-else-if="scope.row.Bak3=='0'" style="color:#F56C6C">取消</span>
+            {{ jstimehandle(scope.row.Createon+'') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="状态"
+                         align="center"
+                         width="100px">
+          <template slot-scope="scope">
+            <span v-if="scope.row.Bak3=='1'"
+                  style="color:#67C23A">准入</span>
+            <span v-else-if="scope.row.Bak3=='2'"
+                  style="color:#E6A23C">暂停</span>
             <span v-else>——</span>
           </template>
         </el-table-column>
-        <el-table-column label="恢复时间" prop="Bak4" align="center" width="100px"></el-table-column>
 
         <!--内框表格操作栏显示-->
-        <el-table-column label="操作" align="center" fixed="right" width="250px">
+        <el-table-column label="操作"
+                         align="center"
+                         fixed="right"
+                         width="150px">
           <template slot-scope="scope">
-            <el-button type="primary" plain title="编辑" size="mini" @click="edit(scope.row)">编辑</el-button>
-            <el-button
+            <el-button type="primary"
+                       plain
+                       title="编辑"
+                       size="mini"
+                       @click="edit(scope.row)">编辑</el-button>
+            <!-- <el-button
               type="primary"
               :disabled="scope.row.Bak3=='0'"
               plain
               title="恢复不良记录状态"
               size="mini"
               @click="back(scope.row)"
-            >恢复</el-button>
-            <el-button type="primary" plain title="删除" size="mini" @click="deleterow(scope.row)">删除</el-button>
+            >恢复</el-button> -->
+            <el-button type="primary"
+                       plain
+                       title="删除"
+                       size="mini"
+                       @click="deleterow(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 分页 -->
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-sizes="[10, 15, 20, 25]"
-        :page-size="size"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount"
-      ></el-pagination>
+      <el-pagination @size-change="handleSizeChange"
+                     @current-change="handleCurrentChange"
+                     :current-page="currentPage"
+                     :page-sizes="[10, 15, 20, 25]"
+                     :page-size="size"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     :total="currentItemCount"></el-pagination>
     </el-card>
 
     <!-- 添加框(默认隐藏) -->
-    <el-dialog title="企业不良行为添加" :visible.sync="addshow" width="360px">
-      <el-form :model="entityForm" :rules="rules" ref="EntityFormref">
+    <el-dialog title="企业不良行为添加"
+               :visible.sync="addshow"
+               width="400px">
+      <el-form :model="entityForm"
+               :rules="rules"
+               ref="EntityFormref">
         <!-- 第一行 -->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="企业名称" prop="CompanyName">
-              <el-input placeholder="请选择企业名称" v-model="entityForm.CompanyName" style="width:100%">
-                <el-button
-                  type="primary"
-                  style="width:30%"
-                  @click="companyDialog = true"
-                  slot="append"
-                >选择</el-button>
+            <el-form-item label="企业名称"
+                          prop="CompanyName">
+              <el-input placeholder="请选择企业名称"
+                        v-model="entityForm.CompanyName"
+                        readonly
+                        style="width:100%">
+                <el-button type="primary"
+                           style="width:30%"
+                           @click="companyDialog = true"
+                           slot="append">选择</el-button>
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <!-- 第二行 -->
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="准入类别" prop="Categorycode">
               <el-select
@@ -144,48 +180,77 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-form-item label="不良行为时间">
-            <el-date-picker
-              v-model="entityForm.Bak2"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-              style="width: 100%"
-            ></el-date-picker>
+            <!-- <el-date-picker v-model="entityForm.Bak2"
+                            type="date"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                            style="width: 100%"></el-date-picker> -->
+            <el-date-picker v-model="Bak2"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item label="状态"
+                        prop="Bak3">
+            <el-select v-model="entityForm.Bak3"
+                       placeholder="请选择"
+                       style="width:100%">
+              <el-option v-for="item in options"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-row>
-
         <!-- 第叁行 -->
         <el-row>
-          <el-form-item label="不良行为" prop="Record">
-            <el-input type="textarea" v-model="entityForm.Record"></el-input>
+          <el-form-item label="不良行为"
+                        prop="Record">
+            <el-input type="textarea"
+                      v-model="entityForm.Record"></el-input>
           </el-form-item>
         </el-row>
       </el-form>
       <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
+        <el-button size="small"
+                   @click="addshow = false">取 消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   @click="addAnnualAudit()">确 定</el-button>
       </span>
     </el-dialog>
 
     <!-- 编辑框(默认隐藏) -->
-    <el-dialog title="企业不良行为编辑" :visible.sync="editshow" width="360px">
-      <el-form :model="editForm" :rules="rules" ref="EditFormref">
+    <el-dialog title="企业不良行为编辑"
+               :visible.sync="editshow"
+               width="400px">
+      <el-form :model="editForm"
+               :rules="rules"
+               ref="EditFormref">
         <!-- 第一行 -->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="企业名称" required prop="Companyname">
-              <el-input v-model="editForm.Companyname" disabled></el-input>
+            <el-form-item label="企业名称"
+                          required
+                          prop="Companyname">
+              <el-input v-model="editForm.Companyname"
+                        disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <!-- 第二行 -->
-        <el-row>
+        <!-- <el-row>
           <el-col :span="24">
             <el-form-item label="准入类别" required prop="Categorycode">
               <el-select style="width: 100%" v-model="editForm.Categorycode" disabled>
@@ -195,79 +260,112 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
 
         <el-row>
           <el-form-item label="不良行为时间">
-            <el-date-picker
-              v-model="editForm.Bak2"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-              style="width: 100%"
-            ></el-date-picker>
+            <!-- <el-date-picker v-model="editForm.Bak2"
+                            type="date"
+                            format="yyyy 年 MM 月 dd 日"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"
+                            style="width: 100%"></el-date-picker> -->
+            <el-date-picker v-model="Bak22"
+                            type="daterange"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+            </el-date-picker>
           </el-form-item>
         </el-row>
+        <el-form-item label="状态"
+                      prop="Bak3">
+          <el-select v-model="editForm.Bak3"
+                     placeholder="请选择"
+                     style="width:100%">
+            <el-option v-for="item in options"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
 
         <!-- 第三行 -->
         <el-row>
           <el-col :span="24">
-            <el-form-item label="不良记录" required prop="Record">
-              <el-input style="width: 100%" type="textarea" v-model="editForm.Record"></el-input>
+            <el-form-item label="不良记录"
+                          required
+                          prop="Record">
+              <el-input style="width: 100%"
+                        type="textarea"
+                        v-model="editForm.Record"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="editshow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="EditSubmit()">确 定</el-button>
+        <el-button size="small"
+                   @click="editshow = false">取 消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   @click="EditSubmit()">确 定</el-button>
       </span>
     </el-dialog>
 
-    <el-dialog title="企业列表" :visible.sync="companyDialog" top="5vh">
+    <el-dialog title="企业列表"
+               :visible.sync="companyDialog"
+               top="5vh">
       <span style="float: right;">
-        <el-button
-          type="primary"
-          size="mini"
-          style="margin-left:10px; margin-top: -4px;"
-          @click="initCompany($event)"
-        >查询</el-button>
-        <el-button
-          type="primary"
-          size="mini"
-          style="margin-left:10px; margin-top: -4px;"
-          @click="companyDialog = false"
-        >取消</el-button>
+        <el-button type="primary"
+                   size="mini"
+                   style="margin-left:10px; margin-top: -4px;"
+                   @click="initCompany($event)">查询</el-button>
+        <el-button type="primary"
+                   size="mini"
+                   style="margin-left:10px; margin-top: -4px;"
+                   @click="companyDialog = false">取消</el-button>
       </span>
-      <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+      <el-form ref="form"
+               :inline="true"
+               style="float: right; margin-top: -10px">
         <el-form-item label="企业名称">
-          <el-input
-            size="mini"
-            style="width: 165px;"
-            v-model="companyChooseName"
-            placeholder="请输入企业名称"
-          ></el-input>
+          <el-input size="mini"
+                    style="width: 165px;"
+                    v-model="companyChooseName"
+                    placeholder="请输入企业名称"></el-input>
         </el-form-item>
       </el-form>
-      <el-table size="mini" :data="dataList" border>
-        <el-table-column label="操作" width="100px" align="center" fixed>
+      <el-table size="mini"
+                :data="dataList"
+                border>
+        <el-table-column label="操作"
+                         width="100px"
+                         align="center"
+                         fixed>
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="getChooseCode(scope.row)">选择</el-button>
+            <el-button type="text"
+                       size="small"
+                       @click="getChooseCode(scope.row)">选择</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="Id" label="编码" width="120px" align="center" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="SupplierName" label="名称" align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="Id"
+                         label="编码"
+                         width="120px"
+                         align="center"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="SupplierName"
+                         label="名称"
+                         align="center"
+                         show-overflow-tooltip></el-table-column>
       </el-table>
-      <el-pagination
-        @size-change="handleSizeChange1"
-        @current-change="handleCurrentChange1"
-        :current-page="currentPage1"
-        :page-sizes="[10, 15, 20, 25]"
-        :page-size="size1"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="currentItemCount1"
-      ></el-pagination>
+      <el-pagination @size-change="handleSizeChange1"
+                     @current-change="handleCurrentChange1"
+                     :current-page="currentPage1"
+                     :page-sizes="[10, 15, 20, 25]"
+                     :page-size="size1"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     :total="currentItemCount1"></el-pagination>
     </el-dialog>
   </div>
 </template>
@@ -286,6 +384,15 @@ export default {
   },
   data () {
     return {
+      options: [{
+        value: '1',
+        label: '准入',
+        style: 'color:#67C23A'
+      }, {
+        value: '2',
+        label: '暂停',
+        style: 'color:#E6A23C'
+      }],
       companyChooseName: '',
       companyDialog: false,
       dataList: [],
@@ -301,22 +408,27 @@ export default {
       currentPage1: 1,
       currentItemCount: 0,
       currentItemCount1: 0,
+      Bak2: [],
+      Bak22: [],
       entityForm: {
         CompanyCode: '',
         CompanyName: '',
-        Categorycode: '',
+        // Categorycode: '',
         Record: '',
-        Bak2: ''
+        Bak2: '',
+        Bak3: '2'
       },
       editForm: {
         Companyname: '',
-        Categorycode: '',
+        Companycode: '',
+        // Categorycode: '',
         Record: '',
-        Bak2: ''
+        Bak2: '',
+        Bak3: ''
       },
       searchForm: {
-        Companyname: '',
-        Categorycode: ''
+        Companyname: ''
+        // Categorycode: ''
       },
       rules: {
         CompanyName: [
@@ -326,13 +438,20 @@ export default {
             trigger: 'change'
           }
         ],
-        Categorycode: [
+        Bak3: [
           {
             required: true,
-            message: '请选择准入类别',
+            message: '请选择企业状态',
             trigger: 'change'
           }
         ],
+        // Categorycode: [
+        //   {
+        //     required: true,
+        //     message: '请选择准入类别',
+        //     trigger: 'change'
+        //   }
+        // ],
         Record: [
           {
             required: true,
@@ -345,38 +464,38 @@ export default {
   },
 
   methods: {
-    back (row) {
-      var id = row.Id
-      console.log(id)
-      this.$confirm('确定恢复不良记录状态?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          setapi
-            .backbadrecordbyid(id, this.$axios)
-            .then(res => {
-              if (res.data.code === 0) {
-                // 刷新列表
-                this.initDatas()
-                this.$message({
-                  type: 'success',
-                  message: res.data.message
-                })
-              } else {
-                this.$message({
-                  type: 'warning',
-                  message: res.data.message
-                })
-              }
-            })
-            .catch(err => {
-              console.error(err)
-            })
-        })
-        .catch(() => {})
-    },
+    // back (row) {
+    //   var id = row.Id
+    //   console.log(id)
+    //   this.$confirm('确定恢复不良记录状态?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   })
+    //     .then(() => {
+    //       setapi
+    //         .backbadrecordbyid(id, this.$axios)
+    //         .then(res => {
+    //           if (res.data.code === 0) {
+    //             // 刷新列表
+    //             this.initDatas()
+    //             this.$message({
+    //               type: 'success',
+    //               message: res.data.message
+    //             })
+    //           } else {
+    //             this.$message({
+    //               type: 'warning',
+    //               message: res.data.message
+    //             })
+    //           }
+    //         })
+    //         .catch(err => {
+    //           console.error(err)
+    //         })
+    //     })
+    //     .catch(() => {})
+    // },
     changeVal (val) {
       if (val != null && val !== '') {
         return val
@@ -390,6 +509,15 @@ export default {
       this.companyDialog = false
     },
     EditSubmit () {
+      if (this.Bak22 && this.Bak22.length !== 0) {
+        if (typeof (this.Bak22[0]) === 'string' || typeof (this.Bak22[1]) === 'string') {
+          this.editForm.Bak2 = this.Bak22[0] + ' 至 ' + this.Bak22[1]
+        } else {
+          var startDate = this.formatDateTime(this.Bak22[0])
+          var endDate = this.formatDateTime(this.Bak22[1])
+          this.editForm.Bak2 = startDate + ' 至 ' + endDate
+        }
+      }
       this.$refs['EditFormref'].validate(valid => {
         if (valid) {
           setapi
@@ -409,6 +537,8 @@ export default {
                   message: res.data.message
                 })
               }
+              this.Bak22 = []
+              this.editForm.Bak2 = ''
             })
             .catch(err => {
               console.error(err)
@@ -421,8 +551,15 @@ export default {
       this.editshow = true // 显示界面
       this.editForm.Companyname = row.Companyname // 反显名称
       this.editForm.Categorycode = row.Categorycode // 返现类别名称根据value值
+      this.editForm.Companycode = row.Companycode // 返现类别名称根据value值
       this.editForm.Record = row.Record // 返现类别名称根据value值
-      this.editForm.Bak2 = row.Bak2 // 返现类别名称根据value值
+      this.editForm.Bak3 = row.Bak3 // 返现类别名称根据value值
+      if (row.Bak2.indexOf(' 至 ') !== -1) {
+        var arr = row.Bak2.split(' 至 ')
+        this.Bak22 = arr
+      } else {
+        this.Bak22 = []
+      }
     },
 
     deleterow (row) {
@@ -454,10 +591,16 @@ export default {
               console.error(err)
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 增加方法
     addAnnualAudit () {
+      // 处理时间段
+      if (this.Bak2 && this.Bak2.length !== 0) {
+        var startDate = this.formatDateTime(this.Bak2[0])
+        var endDate = this.formatDateTime(this.Bak2[1])
+        this.entityForm.Bak2 = startDate + ' 至 ' + endDate
+      }
       this.$refs['EntityFormref'].validate(valid => {
         if (valid) {
           setapi
@@ -473,6 +616,8 @@ export default {
                   message: res.data.message
                 })
                 this.$refs['EntityFormref'].resetFields()
+                this.Bak2 = []
+                this.entityForm.Bak2 = ''
               } else {
                 this.$message({
                   type: 'warning',
@@ -560,7 +705,33 @@ export default {
       this.searchForm.Companyname = ''
       this.searchForm.Categorycode = ''
       this.initDatas()
+    },
+    jstimehandle (val) {
+      if (val === '') {
+        return '----'
+      } else if (val === '0001-01-01T08:00:00+08:00') {
+        return '----'
+      } else if (val === '5000-01-01T23:59:59+08:00') {
+        return '永久'
+      } else {
+        val = val.replace('T', ' ')
+        return val.substring(0, 10)
+      }
+    },
+
+    formatDateTime (date) {
+      var y = date.getFullYear()
+      var m = date.getMonth() + 1
+      m = m < 10 ? ('0' + m) : m
+      var d = date.getDate()
+      d = d < 10 ? ('0' + d) : d
+      // var h = date.getHours()
+      // var minute = date.getMinutes()
+      // minute = minute < 10 ? ('0' + minute) : minute
+      // return y + '-' + m + '-' + d + ' ' + h + ':' + minute
+      return y + '-' + m + '-' + d
     }
+
   }
 }
 </script>