前后:导入60换23;合同文案

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -495,6 +495,11 @@ func (this *OilContractController) GetEntity() {
 // @router /importexcel [get]
 func (this *OilContractController) ImportExcel() {
 	go func() {
+		defer func() {
+			if err := recover(); err != nil {
+				log.Println("合同导入err", err)
+			}
+		}()
 		url := this.GetString("ExcelUrl")
 		//var errLineNum string
 
@@ -504,6 +509,8 @@ func (this *OilContractController) ImportExcel() {
 
 		_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 		filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+		//60.30.245.229 替换成23
+		url = strings.Replace(url, "60.30.245.229", "10.76.248.23", -1)
 		utils.DownloadFile(url, filename, _dir)
 		t := time.Now()
 		filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename

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

@@ -849,6 +849,7 @@ func (this *OilBasisBuildController) ImportExcel() {
 
 	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 	filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+	url = strings.Replace(url, "60.30.245.229", "10.76.248.23", -1)
 	utils.DownloadFile(url, filename, _dir)
 	t := time.Now()
 	filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename

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

@@ -1538,6 +1538,7 @@ func (this *OilGoodsAptitudeController) ImportExcel() {
 	go func() {
 		_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 		filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+		url = strings.Replace(url, "60.30.245.229", "10.76.248.23", -1)
 		utils.DownloadFile(url, filename, _dir)
 		t := time.Now()
 		filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename

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

@@ -422,6 +422,7 @@ func (this *OilCatalogController) ImportExcel() {
 	}
 	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 	filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+	url = strings.Replace(url, "60.30.245.229", "10.76.248.23", -1)
 	utils.DownloadFile(url, filename, _dir)
 
 	filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename

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

@@ -2471,6 +2471,7 @@ func (this *OilSupplierController) ImportExcel() {
 	}
 	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 	filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+	url = strings.Replace(url, "60.30.245.229", "10.76.248.23", -1)
 	utils.DownloadFile(url, filename, _dir)
 	t := time.Now()
 	filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename

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

@@ -1120,6 +1120,7 @@ func (this *OilTechnologyServiceController) ImportExcel() {
 
 	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 	filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
+	url = strings.Replace(url, "60.30.245.229", "10.76.248.23", -1)
 	utils.DownloadFile(url, filename, _dir)
 	t := time.Now()
 	filePath := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx/" + filename

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)">创建日常评价</el-button>
           <el-button type="primary" size="mini"
                      v-if="(Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness) && formData.IsBusiness == 1"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)">创建日常评价</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -68,8 +68,8 @@
 
         <el-table-column label="操作" min-width="140" align="center" fixed>
           <template slot-scope="scope">
-            <el-button v-if="editeBoolean && scope.row.Status <= 0" type="text" title="编辑" size="small" icon="el-icon-edit"
-                       @click="onNavigateEvaluate(scope.row)">编辑
+            <el-button v-if="editeBoolean && scope.row.Status <= 0" type="text" title="评价" size="small" icon="el-icon-edit"
+                       @click="onNavigateEvaluate(scope.row)">评价
             </el-button>
             <el-button v-else type="text" title="查看" size="small" icon="el-icon-edit"
                        @click="onNavigateEvaluate(scope.row)">查看

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <= 0 && saveButton) || (formData.Status == '4' && auditBtn)  || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)">创建日常评价</el-button>
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)) && formData.IsBusiness == 1"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)">创建日常评价</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -68,8 +68,8 @@
 
         <el-table-column label="操作" min-width="140" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" v-if="editeBoolean && scope.row.Status <= 0" title="编辑" size="small" icon="el-icon-edit"
-                       @click="onNavigateEvaluate(scope.row)">编辑
+            <el-button type="text" v-if="editeBoolean && scope.row.Status <= 0" title="评价" size="small" icon="el-icon-edit"
+                       @click="onNavigateEvaluate(scope.row)">评价
             </el-button>
             <el-button type="text" v-else size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看
             </el-button>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/index.vue

@@ -315,6 +315,7 @@
         <el-table
             :data="tableDataList.tableData"
             stripe
+            highlight-current-row
             :border="true"
             height="500"
             size="small"

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/_opera/evaluate.vue

@@ -42,10 +42,10 @@
 
           <el-button type="primary" size="mini"
                      v-if="((Number(formData.Status) <=0 && saveButton) || (formData.Status == '4' && auditBtn) || (formData.Status == '7' && auditBtn)) && formData.IsBusiness != 1"
-                     @click="onSeaveBigAdd(1)">保存</el-button>
+                     @click="onSeaveBigAdd(1)">创建日常评价</el-button>
           <el-button type="primary" size="mini"
                      v-if="(Number(formData.Status) <=0 && saveButtonForBusiness) || (formData.Status == '7' && saveButtonForBusiness)"
-                     @click="onSaveEvaByBusiness(1)">保存</el-button> <!-- 处室保存 -->
+                     @click="onSaveEvaByBusiness(1)">创建日常评价</el-button> <!-- 处室保存 -->
           <el-button @click="onBack" type="primary" size="mini" style="margin-left: 8px">返回</el-button>
         </span>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -67,8 +67,8 @@
                          width="55"></el-table-column>
         <el-table-column label="操作" min-width="140" align="center" fixed>
           <template slot-scope="scope">
-            <el-button v-if="editeBoolean && scope.row.Status <= 0" type="text" title="编辑" size="small" icon="el-icon-edit"
-                       @click="onNavigateEvaluate(scope.row)">编辑
+            <el-button v-if="editeBoolean && scope.row.Status <= 0" type="text" title="评价" size="small" icon="el-icon-edit"
+                       @click="onNavigateEvaluate(scope.row)">评价
             </el-button>
             <el-button v-else type="text" title="查看" size="small" icon="el-icon-edit"
                        @click="onNavigateEvaluate(scope.row)">查看