Browse Source

问题修改

SunZehao 1 year ago
parent
commit
073db3a906

+ 10 - 6
src/components/assessment/assessmentApplicationFrom.vue

@@ -116,9 +116,9 @@
                                      <el-input-number v-model="scope.row.serialNumber" :min="1" />
                                 </template>
                             </el-table-column>
-                            <el-table-column label="操作" width="120">
+                            <el-table-column label="操作" width="120" v-if="isShowFn(receiptMsg.stage)">
                                 <template #default="scope">
-                                    <p class="indicitem" v-if="isShowFn(receiptMsg.stage)" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
+                                    <p class="indicitem" @click="deleteRowFn(scope.row, scope.$index)">删除</p>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -151,22 +151,26 @@
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="工作内容">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.jobContent" :rows="1" type="textarea" />
+                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.jobContent" :rows="2" type="textarea" />
+                                    <pre v-else>{{scope.row.jobContent}}</pre>
                                 </template>
                             </el-table-column>
                             <el-table-column label="完成情况">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.completionStatus" />
+                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.completionStatus" :rows="2" type="textarea" />
+                                    <pre v-else>{{scope.row.completionStatus}}</pre>
                                 </template>
                             </el-table-column>
                             <el-table-column label="相关处室" width="200">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.relatedOffice" />
+                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.relatedOffice" />
+                                    <span v-else>{{scope.row.relatedOffice}}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column label="经办人" width="200">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.handlePeopleName" />
+                                    <el-input v-if="isShowFn(receiptMsg.stage)" v-model="scope.row.handlePeopleName" />
+                                    <span v-else>{{scope.row.handlePeopleName}}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column label="排序" >

+ 1 - 1
src/components/assessment/evaluationApplicationTab.vue

@@ -9,7 +9,7 @@
                             <el-date-picker
                                 v-model="timeIds"
                                 type="monthrange"
-                                :clearable="false"
+                                unlink-panels
                                 value-format="YYYY-MM"
                                 range-separator="To"
                                 start-placeholder="开始时间"

+ 2 - 2
src/components/taskCenter/taskApplicationFrom.vue

@@ -159,12 +159,12 @@
                             <el-table-column label="序号" type="index" width="80" />
                             <el-table-column label="工作内容">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.jobContent" :rows="1" type="textarea" />
+                                    <el-input v-model="scope.row.jobContent" :rows="2" type="textarea" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="完成情况">
                                 <template #default="scope">
-                                    <el-input v-model="scope.row.completionStatus" />
+                                    <el-input v-model="scope.row.completionStatus" :rows="2" type="textarea" />
                                 </template>
                             </el-table-column>
                             <el-table-column label="相关处室" width="200">

+ 2 - 1
src/utils/baseUrl.js

@@ -10,7 +10,8 @@ switch (process.env.NODE_ENV) {
     case 'development': 
         baseUrl.ROOT = "/api"  //开发环境url
         // baseUrl.URL = "http://10.65.59.67:28800"
-        baseUrl.URL = "http://192.168.2.8:28800"
+        // baseUrl.URL = "http://192.168.2.8:28800"
+        baseUrl.URL = "http://192.168.100.249:28800"
         // baseUrl.URL = "http://10.65.78.23:28800"  //测试环境
         // baseUrl.URL = "http://10.65.78.81:28800"  // 正式环境
         break