Bladeren bron

前后:文案;宽度等

dubch 4 jaren geleden
bovenliggende
commit
b20dc6add3

+ 2 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -2664,7 +2664,7 @@ func (this *OilSupplierController) CheckSupplierFile() {
 			where1 := " SupplierId = '" + strconv.Itoa(file.SupplierId) + "' and NeedFileType = '" + needHeader.FileName + "'"
 			filesvc.GetEntityByWhere("OilSupplierFile", where1, &fileist1)
 
-			var filelist2 suppliercertappendsub.OilAppendChangeDetail
+			var filelist2 qualchange.OilQualChangeDetail
 			where2 := " SupplierId = '" + strconv.Itoa(file.SupplierId) + "' and NeedFileType = '" + needHeader.FileName + "'"
 			svc2 := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
 			svc2.GetEntityByWhere("OilQualChangeDetail", where2, &filelist2)
@@ -2810,7 +2810,7 @@ func (this *OilSupplierController) CheckSupplierFileNew(){
 				var filelist2 suppliercertappendsub.OilAppendChangeDetail
 				where2 := " SupplierId = '" + strconv.Itoa(file.SupplierId) + "' and NeedFileType = '" + needHeader.FileName + "'"
 				svc2 := suppliercertappendsub.GetOilSupplierCertAppendSubService(utils.DBE)
-				svc2.GetEntityByWhere("OilQualChangeDetail", where2, &filelist2)
+				svc2.GetEntityByWhere("OilAppendChangeDetail", where2, &filelist2)
 				if filelist2.FileName == "" && fileist1.FileName == "" {
 					//缺少的资质
 					errinfo.Message = "请上传!" + needHeader.FileName + "!"

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

@@ -95,7 +95,7 @@
 
         <el-table-column sortable show-overflow-tooltip label="评价内容及得分" header-align="center" >
           <el-table-column sortable show-overflow-tooltip prop="Score1" header-align="center" label="项目组织实施(10分)" min-width="155" align="center"></el-table-column>
-          <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="项目质量管理(20分)" min-width="155" align="center"></el-table-column>
+          <el-table-column sortable show-overflow-tooltip prop="Score2" header-align="center" label="项目质量管理(20分)" min-width="160" align="center"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score3" header-align="center" label="项目职业健康安全与环境管理(20分)" min-width="255" align="center"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score4" header-align="center" label="项目成本管理(5分)" min-width="155" align="center"></el-table-column>
           <el-table-column sortable show-overflow-tooltip prop="Score5" header-align="center" label="项目进度管理(10分)" min-width="155" align="center"></el-table-column>

+ 3 - 3
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluationlist.vue

@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column
           property="Reason"
-          label="不合格原因"
+          label="扣分原因"
           header-align="center"
           width="120"
           align="center">
@@ -88,7 +88,7 @@
     </el-pagination> -->
 
     <el-dialog
-      title="不合格原因"
+      title="扣分原因"
       :close-on-click-modal="false"
       :visible.sync="dialogBoolean"
       width="60%"
@@ -197,7 +197,7 @@ export default {
       dialogVisibleCom: false,
       loading: false,
       UnitOrgOptions: [],
-      textareaValue: '',//不合格原因
+      textareaValue: '',//扣分原因
       dialogBoolean: false,
       rules: {
         relation: [

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -1055,7 +1055,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="资质名称" prop="NeedFileType">
-              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable>
+              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable style="width: 100%">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -828,7 +828,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="资质名称" prop="NeedFileType">
-              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable>
+              <el-select v-model="newSubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable style="width: 100%">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>