2
3
Yikoo 5 лет назад
Родитель
Сommit
c2fa27a57f

+ 1 - 1
src/dashoo.cn/backend/api/controllers/oilcontract/contractSumScore.go

@@ -336,7 +336,7 @@ func (this *OilContractSumScoreController) AddEntity() {
 
 	var item2 contractSumScoreItems.OilContractSumScoreItems
 	item2.SumScoreId = entity.Id
-	item2.Category   = 0                      // 二级单位创建
+	item2.Category   = 1                      // 二级单位创建
 	item2.SumScore   = model.SumScore
 	item2.Content1   = model.Content1
 	item2.NormalSumScore1 = model.NormalSumScore1

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

@@ -342,7 +342,7 @@
                 this.updateEvaluate()
               }
             } else {
-              this.$message.error('业绩评价填写的分数有误');
+              this.$message.error('业绩评价填写的分数有误'); 
             }
           })
         }else{//专业处室评价

+ 6 - 5
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -17,7 +17,7 @@
           <!-- v-if="formData.Id!=0&&formData.Status==7" -->
           <el-button type="primary" size="mini" v-if="issueVisibleButton" @click="issueVisible=true">下发</el-button>
           <el-button type="primary" size="mini" v-if="successBoolean" @click="onFinish">完结</el-button>
-          <el-button type="primary" size="mini"  @click="exportExcel">导出</el-button>
+          <el-button type="primary" size="mini" v-if="successBoolean"  @click="exportExcel">导出</el-button>
           <el-button type="primary" size="mini" :loading="addloading" @click="saveEntity">保存</el-button>
           <router-link :to="'/oilcontract/contract-import'">
             <el-button type="primary" size="mini" plain style="margin-left: 8px">返回</el-button>
@@ -147,7 +147,7 @@
 
           <el-col :span="8">
             <el-form-item label="手机号">
-              <el-input v-model="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+              <el-input type='number' v-model.number="formData.ConstructionTelphone" placeholder="请输入"  style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -165,7 +165,7 @@
 
           <el-col :span="8">
             <el-form-item label="手机号">
-              <el-input v-model="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+              <el-input type='number' v-model.number="formData.BuildTelphone" placeholder="请输入"  style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -183,7 +183,7 @@
 
           <el-col :span="8">
             <el-form-item label="手机号">
-              <el-input v-model="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+              <el-input type='number' v-model.number="formData.SuperviseTelphone" placeholder="请输入"  style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -201,7 +201,7 @@
 
           <el-col :span="8">
             <el-form-item label="手机号">
-              <el-input v-model="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
+              <el-input type='number' v-model.number="formData.QualityTelphone" placeholder="请输入"  style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
@@ -694,4 +694,5 @@
     height: 120px;
   }
 
+
 </style>

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

@@ -388,7 +388,7 @@
           },
           {
             prop: "Status",
-            label: '项目类别',
+            label: '合同状态',
             width: 100,
             sort: true
           },

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-work-order/index.vue

@@ -42,7 +42,7 @@
             <el-button type="text" size="small" icon="el-icon-edit" @click="onNavigateDetail(scope.row)">打开</el-button>
             <!-- </router-link> -->
 
-            <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
+            <!-- <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
               <el-alert
                 title=""
                 description="确认要删除吗?"
@@ -54,7 +54,7 @@
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
               </div>
               <el-button slot="reference" type="text"  style="margin-left:3px" size="small" icon="el-icon-delete" >删除</el-button>
-            </el-popover>
+            </el-popover> -->
           </template>
         </el-table-column>