按钮调整

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

@@ -1225,9 +1225,10 @@ func (this *OilGoodsAptitudeController) ImportExcel() {
 	}
 
 	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
-	utils.DownloadFile(url, "temp.xlsx", _dir)
+	filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+	utils.DownloadFile(url, filename, _dir)
 	t := time.Now()
-	filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/temp.xlsx"
+	filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename
 	xlFile, err := xlsx.OpenFile(filePath)
 	var errLineNum string
 
@@ -1390,14 +1391,35 @@ func (this *OilGoodsAptitudeController) InsertGoodsAptitude() {
 
 	defer session.Close()
 	svc := goodsaptitude.GetOilGoodsAptitudeSession(session)
-	err = svc.InsertGoodsAptitude(Tmp_OilGoodsAptitudeName, OilGoodsAptitudeName)
 
 	var errinfo ErrorInfo
+	err = svc.TruncateTable(OilGoodsAptitudeName)
+
+	if err != nil {
+		session.Rollback()
+		errinfo.Code = -1
+		errinfo.Message = "跟新失败！"
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+
+	err = svc.TruncateTable(OilGoodsAptitudeClassName)
+
 	if err != nil {
 		session.Rollback()
 		errinfo.Code = -1
 		errinfo.Message = "跟新失败！"
-		this.Data["josn"] = &errinfo
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+
+	err = svc.InsertGoodsAptitude(Tmp_OilGoodsAptitudeName, OilGoodsAptitudeName)
+
+	if err != nil {
+		session.Rollback()
+		errinfo.Code = -1
+		errinfo.Message = "跟新失败！"
+		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
 

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

@@ -183,11 +183,11 @@ module.exports = {
 
     /* --------Nuxt Start发版用 START-------------- */
     /*
-        appclient:  'gfgl',                            //供方信息管理平台
-        upfilehost: '/uploadfile',                     //附件上传
-        baseURL:    '/api/',                           //本地工作流图片
-        LOCAL_IP:   '10.76.248.23'                     //定义服务器内网IP,word转PDF时用到
-        // API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
+    appclient:  'gfgl',                            //供方信息管理平台
+    upfilehost: '/uploadfile',                     //附件上传
+    baseURL:    '/api/',                           //本地工作流图片
+    LOCAL_IP:   '10.76.248.23'                     //定义服务器内网IP,word转PDF时用到
+    // API_URL:    'http://10.76.248.23:10091/api/'   //服务器渲染时调用
     */
     /* --------Nuxt Start发版用 END-------------- */
   },

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

@@ -17,16 +17,12 @@
           </el-button>
 
 
-
-          <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="importExcel">导入
-          </el-button>
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="showimport">查看导入内容
-          </el-button>
-          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="updatasuppiercertsub()">更新企业资质
+          <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="showimport">更新物资编码
           </el-button>
           <router-link :to="'/oilsupplier/goodsaptitude/_opera/showdelcertsub'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">查看待删除准入项</el-button>
           </router-link>
+
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
 
@@ -286,26 +282,30 @@
     <el-dialog title="上传文件"  width="600px" :visible.sync="uploadshow">
       <el-form label-width="100px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
                        :http-request="uploadrequest" :before-upload="beforeAvatarUpload">
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
-            <el-button size="mini" type="primary" @click="uploadExcel()">导入</el-button>
+          </el-col>
+          <el-col :span="24">
+            <el-button style="float: right;" size="mini" type="primary" @click="uploadExcel()">确定</el-button>
           </el-col>
         </el-row>
       </el-form>
     </el-dialog>
-    <el-dialog title="新导入"  width="100%" top="5vh" :visible.sync="showimportvisible">
+    <el-dialog title="新导入"  width="95%" top="5vh" :visible.sync="showimportvisible">
       <el-card class="box-card" v-loading="loading">
         <div slot="header">
           <span>
-            <i class="icon icon-table2"></i> 物资类项目与资质对照表(新导入)
+            <i class="icon icon-table2"></i> 对照表(新导入)
           </span>
           <span style="float: right;">
+            <el-button type="primary" size="mini" style="margin-left:20px; margin-top: -4px;" @click="importExcel">导入
+          </el-button>
             <el-button type="warning" size="mini" style="margin-left:10px; margin-top: -4px;" @click="truncateimport()">清空所有导入
             </el-button>
-            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="confirmImport()">确认跟新
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="confirmImport()">确认更新
             </el-button>
           </span>
           <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
@@ -813,22 +813,22 @@
         this.deleteDialogVisible = true
       },
       updatasuppiercertsub () {
-        this.$confirm('此操作将更新企业资质, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.importloading = true
-          api.updataSuppierCertSub(this.$axios).then(res => {
-            this.importloading = false
-            if (res.data.code === 0) {
-              this.$message({
-                type: 'success',
-                message: res.data.message
-              })
-            }
-          })
+        // this.$confirm('此操作将更新企业资质, 是否继续?', '提示', {
+        //   confirmButtonText: '确定',
+        //   cancelButtonText: '取消',
+        //   type: 'warning'
+        // }).then(() => {
+        this.importloading = true
+        api.updataSuppierCertSub(this.$axios).then(res => {
+          this.importloading = false
+          if (res.data.code === 0) {
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+          }
         })
+        // })
       },
       truncateimport () {
         this.$confirm('此操作将清空导入的数据, 是否继续?', '提示', {
@@ -859,13 +859,15 @@
           type: 'warning'
         }).then(() => {
           api.insertGoodsAptitude(this.$axios).then(res => {
+            this.showimportvisible = false
+            console.log(res)
             if (res.data.code === 0) {
               this.$message({
                 type: 'success',
                 message: res.data.message
               })
-              this.showimportvisible = false
               this.initDatas()
+              this.updatasuppiercertsub()
             } else {
               this.$message({
                 type: 'warning',
@@ -892,6 +894,7 @@
               type: 'success',
               message: res.data.message
             })
+            this.initImportDatas()
           } else if (res.data.code === -1) {
             this.errorDialogVisible = true
             this.textarea = res.data.message