瀏覽代碼

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

XMLWAN 4 年之前
父節點
當前提交
b4d3ee8aac

+ 1 - 1
src/xt_pages/device/airDisinfect.vue 查看文件

48
                   {{getName(scope.row.creator)}}
48
                   {{getName(scope.row.creator)}}
49
                 </template>
49
                 </template>
50
             </el-table-column>
50
             </el-table-column>
51
-            <el-table-column label="检查结果" width="180">
51
+            <el-table-column label="检查结果" min-width="180">
52
                 <template slot-scope="scope">
52
                 <template slot-scope="scope">
53
                    {{scope.row.detection_result}}
53
                    {{scope.row.detection_result}}
54
                 </template>
54
                 </template>

+ 1 - 1
src/xt_pages/device/objectTableDisinfect.vue 查看文件

49
                   {{getName(scope.row.creator)}}
49
                   {{getName(scope.row.creator)}}
50
                 </template>
50
                 </template>
51
             </el-table-column>
51
             </el-table-column>
52
-            <el-table-column label="检查结果" width="180">
52
+            <el-table-column label="检查结果" min-width="180">
53
                 <template slot-scope="scope">
53
                 <template slot-scope="scope">
54
                    {{scope.row.detection_result}}
54
                    {{scope.row.detection_result}}
55
                 </template>
55
                 </template>

+ 2 - 2
src/xt_pages/outpatientCharges/summary.vue 查看文件

40
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
40
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
41
         </div>
41
         </div>
42
         <div>
42
         <div>
43
-          <el-popover
43
+          <!-- <el-popover
44
             placement="bottom"
44
             placement="bottom"
45
             width="210"
45
             width="210"
46
             trigger="click">
46
             trigger="click">
48
             <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
48
             <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
49
             <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
49
             <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
50
 
50
 
51
-          </el-popover>
51
+          </el-popover> -->
52
           <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
52
           <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
53
         </div>
53
         </div>
54
       </div>
54
       </div>