首页

src/dashoo.cn/backend/api/conf/app.conf

@@ -64,9 +64,9 @@ callbackHost=http://36dcae10.ngrok.io
 goodsModuleHost=http://weed1.labsop.cn:9390/6,2fe2d9949468
 basisModuleHost=http://weed1.labsop.cn:9390/1,2fe101019c4d
 techModuleHost=http://weed1.labsop.cn:9390/6,2fe01891af44
-goodsPdfHost=http://weed1.labsop.cn:9390/1,30f4c4b98714
-basisPdfHost=http://weed1.labsop.cn:9390/5,30f017885dbc
-techPdfHost=http://weed1.labsop.cn:9390/4,30f34d077f44
+goodsPdfHost=http://weed1.labsop.cn:9390/1,363c179f05a5
+basisPdfHost=http://weed1.labsop.cn:9390/5,363a63175da9
+techPdfHost=http://weed1.labsop.cn:9390/4,363bbbd2d097
 OriginUrl=http://47.92.212.59:8081/acti-api/api
 AposeUrl=http://47.92.212.59:8081/acti-api/api/apose
 BaseUrl=http://47.92.212.59:8081/acti-api/api/acti

src/dashoo.cn/backend/api/controllers/document/document.go

@@ -41,7 +41,7 @@ func (this *DocumentController) GetDocumentList() {
 
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
 	var list []documentmanage.DocumentInfo
-	total, list := svc.GetDocumentInfoByWhere(page.CurrentPage, page.Size, "Id desc", this.User.AccCode+DocumentInfoName, where)
+	total, list := svc.GetDocumentInfoByWhere(page.CurrentPage, page.Size, "Id desc", DocumentInfoName, where)
 
 	var datainfo DataInfo
 	datainfo.Items = list
@@ -99,7 +99,7 @@ func (this *DocumentController) AddDocumentInfo() {
 
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
 
-	_, err := svc.InsertEntityBytbl(this.User.AccCode+DocumentInfoName, &model)
+	_, err := svc.InsertEntityBytbl(DocumentInfoName, &model)
 	var errinfo ErrorDataInfo
 	if err == nil {
 		errinfo.Message = "保存成功！"
@@ -136,7 +136,7 @@ func (this *DocumentController) EditDocumentInfo() {
 
 	var entityempty documentmanage.DocumentInfo
 	var docinfo documentmanage.DocumentInfo
-	svc.GetEntityByIdBytbl(this.User.AccCode+DocumentInfoName, id, &docinfo)
+	svc.GetEntityByIdBytbl(DocumentInfoName, id, &docinfo)
 
 	model.ModifiedOn = time.Now()
 	model.ModifiedBy = this.User.Realname
@@ -175,7 +175,7 @@ func (this *DocumentController) DeleteDocumentData() {
 	}
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
 	whereStr := "Id= " + utils.ToStr(id)
-	err = svc.DeleteEntityBytbl(this.User.AccCode+DocumentInfoName, whereStr)
+	err = svc.DeleteEntityBytbl(DocumentInfoName, whereStr)
 
 	if err == nil {
 		errinfo.Message = "删除成功"
@@ -273,7 +273,7 @@ func (this *DocumentController) Geteditinitinfo() {
 	id := this.Ctx.Input.Param(":id")
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
 	var list documentmanage.DocumentInfo
-	svc.GetEntityByIdBytbl(this.User.AccCode+DocumentInfoName, id, &list)
+	svc.GetEntityByIdBytbl(DocumentInfoName, id, &list)
 	var datainfo DataInfo
 	datainfo.Items = list
 	this.Data["json"] = &datainfo
@@ -296,7 +296,7 @@ func (this *DocumentController) GetDocumentHistoryList() {
 		return
 	}
 	svc := documentmanage.GetDocumentmanageService(utils.DBE)
-	total, list := svc.GetDocumentHistoryByWhere(page.CurrentPage, page.Size, "Id desc", this.User.AccCode+DocumentInfoName, this.User.AccCode+DocumentHistoryName, InfoId)
+	total, list := svc.GetDocumentHistoryByWhere(page.CurrentPage, page.Size, "Id desc", DocumentInfoName, this.User.AccCode+DocumentHistoryName, InfoId)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total

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

@@ -7,8 +7,10 @@ import (
 	. "dashoo.cn/backend/api/controllers"
 	"dashoo.cn/utils"
 	"encoding/json"
+	"fmt"
 	"reflect"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -439,7 +441,9 @@ func (this *SupplierDataEntryController) PdfExport() {
 	datamap["PrintMonth"] = time.Now().Month()
 	datamap["PrintDay"] = time.Now().Day()
 	//获取准入项不良记录
+	zhunruStr := ""
 	if len(tabledata2) != 0{
+		zhunruStr = "准入:"
 		var badRecord  BadRecord.BadRecord
 		svc.GetEntity(&badRecord,"CompanyCode='"+Id+"'")
 		//拼接已暂停准入范围编码名称
@@ -460,18 +464,18 @@ func (this *SupplierDataEntryController) PdfExport() {
 
 	if len(tabledata) != 0 {
 		var Name string
-		Name = "\n正常准入: "+ tabledata[0].Code
-		Name = Name + " " + tabledata[0].Name
+		Name = "\n"+ zhunruStr + strings.TrimSpace(tabledata[0].Code)
+		Name = Name + " " + strings.TrimSpace(tabledata[0].Name)
 		var i int
 		for i = 1; i < len(tabledata); i++ {
 			Name += ";"
-			Name += tabledata[i].Code
-			Name = Name + " " + tabledata[i].Name
+			Name += strings.TrimSpace(tabledata[i].Code)
+			Name = Name + " " + strings.TrimSpace(tabledata[i].Name)
 		}
 		//if i == 100 {
 		//	Name += "(准入范围未完全显示，请到系统查看详情)"
 		//}
-
+		fmt.Println(Name)
 		datamap["Name"] =datamap["Name"].(string) + Name
 	} else {
 		datamap["Name"] =datamap["Name"].(string)

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/src/components/oilsupplier/goodsinfo.vue

@@ -131,8 +131,7 @@
           <el-form-item label="中石油准入证编号">
             <el-input v-model="formData.PACNumber"
                       maxlength="255"
-                      :readonly="this.formData.Status > '0'&&!appendStatus"
-                      placeholder="请输入"
+                      :readonly="this.formData.Status != '8'&&!appendStatus"
                       style="width: 100%">
             </el-input>
           </el-form-item>
@@ -142,7 +141,7 @@
           <el-form-item label="级别" prop="Grade">
             <el-select v-model="formData.Grade"
                        placeholder="请选择级别"
-                       :disabled="this.formData.Status > '0'&&!appendStatus"
+                       :disabled="(this.formData.Status > '0'&&!appendStatus) || this.formData.InStyle =='3'"
                        style="width: 100%"
                        @change="GradeChange">
               <el-option
@@ -1029,13 +1028,18 @@ export default {
     GradeChange (val) {
       if (val === '1') {
         this.formData.MgrUnit = '中油集团公司'
+      } else {
+        this.formData.MgrUnit = ''
       }
     },
     InStyleChange (val) {
       if (val === '2') {
         this.formData.MgrUnit = '中油集团公司'
         this.formData.Grade = '1'
-      }else{
+      } else if (val === '3') {
+        this.formData.Grade = '2'
+        this.formData.MgrUnit = ''
+      } else {
         this.formData.Grade = ''
         this.formData.MgrUnit = ''
       }

src/dashoo.cn/frontend_web/src/pages/datadown.vue

@@ -35,6 +35,9 @@
                             width="141">
             <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
           </el-table-column>
+          <el-table-column width="80">
+            <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strnew(scope.row.CreateOn+'') }}</span></template>
+          </el-table-column>
         </el-table>
     </div>
 
@@ -154,7 +157,20 @@
           return val.substring(0, 10)
         }
       },
-
+      strnew (val) {
+        try {
+          let b = this.jstimehandle(val).split('-')
+          let date = new Date(b[0], b[1], b[2])
+          let newdate = new Date()
+          if ((newdate - date) / (1000 * 60 * 60 * 24) < 30) {
+            return '新'
+          } else {
+            return ''
+          }
+        } catch (e) {
+          return ''
+        }
+      },
       handleSelect (key, keyPath) {
         this.activeIndex = key
       }

src/dashoo.cn/frontend_web/src/pages/documentdown.vue

@@ -35,6 +35,9 @@
                             width="141">
             <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
           </el-table-column>
+          <el-table-column width="80">
+            <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strnew(scope.row.CreateOn+'') }}</span></template>
+          </el-table-column>
         </el-table>
     </div>
 
@@ -155,7 +158,20 @@
           return val.substring(0, 10)
         }
       },
-
+      strnew (val) {
+        try {
+          let b = this.jstimehandle(val).split('-')
+          let date = new Date(b[0], b[1], b[2])
+          let newdate = new Date()
+          if ((newdate - date) / (1000 * 60 * 60 * 24) < 30) {
+            return '新'
+          } else {
+            return ''
+          }
+        } catch (e) {
+          return ''
+        }
+      },
       handleSelect (key, keyPath) {
         this.activeIndex = key
       }

src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -3,17 +3,17 @@
     <div class="back-width">
       <div class="title_png"></div>
       <div class="login-body">
-        <el-carousel arrow="never" indicator-position="none" height="590px">
+        <el-carousel  arrow indicator-position="none" height="590px" :interval="20000">
           <el-carousel-item v-for="(img,index) in imgList" :key="index">
             <img style="width: 100%; height: 100%;" v-bind:src="img.url" >
           </el-carousel-item>
         </el-carousel>
         <section class="login">
-          <el-card class="box-card">
+          <el-card class="box-card" style="background:rgba(255,255,255,0.5)">
             <div slot="header" class="clearfix">
               <i class="el-icon-s-cooperation"></i>
               <span style="font-weight: bold; margin-left: 5px">登录</span>
-              <el-button style="float: right; padding: 3px 0" type="text">欢迎使用</el-button>
+              <!--<el-button style="float: right; padding: 3px 0" type="text">欢迎使用</el-button>-->
             </div>
             <!--<el-menu size="small"
                      :default-active="activeIndex+''"
@@ -25,7 +25,55 @@
               </el-menu-item>
             </el-menu>-->
             <el-row :gutter="8">
-              <el-col :span="12">
+              <el-col :span="13">
+                <el-table :data="noticeList"
+                          size="mini"
+                          style="width: 100%; height: 145px;"
+                          :row-style="getRowstyle">
+                  <el-table-column prop="Name" label="通知通告" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      <el-link :href="getDownloadFile(scope.row.FileURL)"target="_blank"type="primary">{{ scope.row.Name }}</el-link>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="CreateOn"
+                                   label="发布时间"
+                                   width="141">
+                    <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
+                  </el-table-column>
+                  <el-table-column width="80">
+                    <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strnew(scope.row.CreateOn+'') }}</span></template>
+                  </el-table-column>
+                </el-table>
+                <router-link style="font-size: 15px; color: black; float: right; padding: 3px 0" :underline="false" :to="'/datadown'">+更多</router-link>
+                <el-table :data="fileList"
+                          size="mini"
+                          style="width: 100%; height: 145px;"
+                          :row-style="getRowstyle">
+                  <el-table-column prop="Name" label="资料下载" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                      <!--<i class="el-icon-caret-right"></i>-->
+                      <el-link :href="getDownloadFile(scope.row.FileURL)"
+                               target="_blank"
+                               type="primary">{{ scope.row.Name }}</el-link>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="CreateOn"
+                                   label="发布时间"
+                                   width="141">
+                    <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
+                  </el-table-column>
+                  <el-table-column width="80">
+                    <template slot-scope="scope"><span style="font-size: 15px; color: #f13f40">{{strnew(scope.row.CreateOn+'') }}</span></template>
+                  </el-table-column>
+                </el-table>
+
+                <router-link style="font-size: 15px;color: black; float: right; padding: 3px 0" :underline="false" :to="'/documentdown'">+更多</router-link>
+              </el-col>
+
+              <el-col :span="1" content-position="center">
+                <div style="height: 300px; width: 1px; background-color: #cccccc; margin-left: 12px"></div>
+              </el-col>
+              <el-col :span="9">
                 <el-form class="login-form"
                          auto-complete="off"
                          :model="model"
@@ -36,7 +84,7 @@
                                 label=""
                                 prop="username">
                     <el-input prefix-icon="el-icon-user-solid"
-                              type="text"
+                              type="text" style="background:rgba(255,255,255,0.5)"
                               v-model="model.username"
                               placeholder="请输入用户名">
                       <el-select v-model="loginMode"
@@ -83,73 +131,34 @@
                   </el-row>
                   <el-button type="primary"
                              :loading="loading"
-                             @click="loginall()">{{ loading ? '登录中...' : '登录' }}</el-button>
-                  <el-row>
+                             @click="loginall()">{{ loading ? '登录中...' : '登录系统' }}</el-button>
+                  <el-row style="margin-top: 5px" :gutter="10">
                     <el-col :span="12">
                       <router-link :to="'/signup'">
-                        <el-button type="text"
-                                   round>没有账户？请注册</el-button>
+                        <el-button type="plain" style="background:rgba(255,255,255,0.5)">注册账号</el-button>
                       </router-link>
                     </el-col>
                     <el-col :span="12">
                       <router-link :to="'/passwordback'">
-                        <el-button type="text"
-                                   round>忘记密码？</el-button>
+                        <el-button type="plain" style="background:rgba(255,255,255,0.5)">忘记密码</el-button>
                       </router-link>
                     </el-col>
                   </el-row>
                 </el-form>
               </el-col>
-              <el-col :span="1" content-position="center">
-                <div style="height: 300px; width: 1px; background-color: #cccccc; margin-left: 12px"></div>
-              </el-col>
-
-              <el-col :span="11">
-                <el-table :data="noticeList"
-                          size="mini"
-                          style="width: 100%; height: 145px;">
-                  <el-table-column prop="Name"
-                                   label="通知">
-                    <template slot-scope="scope">
-                      <el-link :href="getDownloadFile(scope.row.FileURL)"
-                               target="_blank"
-                               type="primary">{{ scope.row.Name }}</el-link>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="CreateOn"
-                                   label="发布时间"
-                                   width="141">
-                    <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
-                  </el-table-column>
-                </el-table>
-                <router-link style="font-size: 10px; float: right; padding: 3px 0" :underline="false" :to="'/datadown'">+更多</router-link>
-                <el-table :data="fileList"
-                          size="mini"
-                          style="width: 100%; height: 145px;">
-                  <el-table-column prop="Name"
-                                   label="资料下载">
-                    <template slot-scope="scope">
-                      <!--<i class="el-icon-caret-right"></i>-->
-                      <el-link :href="getDownloadFile(scope.row.FileURL)"
-                               target="_blank"
-                               type="primary">{{ scope.row.Name }}</el-link>
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="CreateOn"
-                                   label="发布时间"
-                                   width="141">
-                    <template slot-scope="scope">{{ jstimehandle(scope.row.CreateOn+'') }}</template>
-                  </el-table-column>
-                </el-table>
 
-                <router-link style="font-size: 10px; float: right; padding: 3px 0" :underline="false" :to="'/documentdown'">+更多</router-link>
-              </el-col>
             </el-row>
 
           </el-card>
         </section>
       </div>
     </div>
+    <div >
+      <footer class="login-footer" style="color:#A9A9A9;padding-bottom: 30px">
+        <span></span>
+        <span>推荐使用谷歌浏览器、360浏览器(极速模式)等，Chrome内核浏览器打开本系统</span>
+      </footer>
+    </div>
   </div>
 </template>
 
@@ -206,13 +215,15 @@ import SIdentify from '@/components/VCode.vue'
     return {
       imgList:[
         {
-          url:require('../assets/img/gf20190628.png')
+          url:require('../assets/img/lunbo_1.jpg')
         },{
           url:require('../assets/img/GF002.png')
         },{
           url:require('../assets/img/GF003.png')
+        },{
+          url:require('../assets/img/lunbo_2.jpg')
         }
-        ],
+      ],
       loginMode: parseInt(process.client ? (window.localStorage.getItem('loginMode') ? window.localStorage.getItem('loginMode') : 2) : 2),
       model: model,
       rules: rules,
@@ -247,6 +258,9 @@ import SIdentify from '@/components/VCode.vue'
     SIdentify
   },
   methods: {
+    getRowstyle () {
+      return 'background:rgba(255,255,255,0.5)'
+    },
     // 生成随机数
     randomNum (min, max) {
       return Math.floor(Math.random() * (max - min) + min)
@@ -325,6 +339,20 @@ import SIdentify from '@/components/VCode.vue'
         return val.substring(0, 10)
       }
     },
+    strnew (val) {
+      try {
+        let b = this.jstimehandle(val).split('-')
+        let date = new Date(b[0], b[1], b[2])
+        let newdate = new Date()
+        if ((newdate - date) / (1000 * 60 * 60 * 24) < 30) {
+          return '新'
+        } else {
+          return ''
+        }
+      } catch (e) {
+        return ''
+      }
+    },
     handleSelect (key, keyPath) {
       this.activeIndex = key
     },
@@ -644,6 +672,12 @@ export default class Login extends Vue {
       width: 100%;
     }
   }
+
+  .el-table,
+  .el-table__expanded-cell {
+    background-color: rgba(255,255,255,0.5)
+  }
+
 }
 </style>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -1449,16 +1449,16 @@ export default {
       }
 
       /** 2019.05.16 - 16 准入申请中，若选择了“管理单位”，“中石油准入证编号”应自动改为必填项 */
-      if(this.formData.MgrUnit != null){
-      if (this.formData.MgrUnit.length > 0 && !this.formData.PACNumber) {
-        valid1 = false
-        this.$message({
-          type: 'warning',
-          message: '【中石油准入证编号】不能为空'
-        })
-        return
-      }
-      }
+      // if (this.formData.MgrUnit != null) {
+      //   if (this.formData.MgrUnit.length > 0 && !this.formData.PACNumber) {
+      //     valid1 = false
+      //     this.$message({
+      //       type: 'warning',
+      //       message: '【中石油准入证编号】不能为空'
+      //     })
+      //     return
+      //   }
+      // }
       if (valid1 && valid2) {
         if (!this.formData.SetupTime) {
           this.formData.SetupTime = null