lidie 1 год назад
Родитель
Сommit
213649b95a
2 измененных файлов с 25 добавлено и 118 удалено
  1. 10 8
      src/views/component/shiftHandover/enrolled.vue
  2. 15 110
      src/views/infosManage/fileIE.vue

+ 10 - 8
src/views/component/shiftHandover/enrolled.vue

@@ -13,7 +13,7 @@
     >
         <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
             <!-- 主表选择 -->
-            <el-row>
+            <el-row :gutter="50">
                 <el-col :span="8"> <el-form-item label="部门:" prop="deng_ji_bu_men_">
                     <ibps-user-selector
                         v-model="ruleForm.deng_ji_bu_men_"
@@ -30,12 +30,12 @@
                     <el-date-picker v-model="ruleForm.deng_ji_shi_jian_" type="date" placeholder="选择日期" style="width: 100%;" :disabled="!editPermissions" />
                 </el-form-item></el-col>
             </el-row>
-            <el-form-item label="班次:" prop="ban_ci_">
+            <el-form-item label="班次:" prop="ban_ci_" >
                 <span v-if="editPermissions">早班</span>
-                <span v-else>{{ parentData.zhuang_tai_ === '已早交班' ? '午班' : this.parentData.zhuang_tai_ === '已午交班' ? '晚班' : '' }}</span>
+                <span v-else>{{ parentData.zhuang_tai_ === '已早交班' ? '午班' : parentData.zhuang_tai_ === '已午交班' ? '晚班' : '' }}</span>
                 <!-- <span v-else>{{ ruleForm.ban_ci_ }}</span> -->
             </el-form-item>
-            <el-row>
+            <el-row :gutter="50">
                 <el-col :span="8"><div class="grid-content bg-purple-dark">  <el-form-item label="交班标本:" prop="jiao_ban_biao_ben">
                     <el-input v-model.number="ruleForm.jiao_ban_biao_ben" style="width:30%" /><span>例</span>
                 </el-form-item></div></el-col>
@@ -46,7 +46,7 @@
                     <el-input v-model.number="ruleForm.wei_fa_bao_gao_" style="width:30%" /><span>例</span>
                 </el-form-item></div></el-col>
             </el-row>
-            <el-row>
+            <el-row :gutter="50">
                 <el-col :span="8">
                     <div class="grid-content bg-purple-dark">
                         <el-form-item label="是否查漏:" prop="shi_fou_cha_lou_" required>
@@ -66,7 +66,7 @@
             <el-form-item label="其他异常情况:" prop="qi_ta_qing_kuang_">
                 <el-input v-model="ruleForm.qi_ta_qing_kuang_" type="textarea" />
             </el-form-item>
-            <el-row>
+            <el-row :gutter="50">
                 <el-col :span="8">
                     <div class="grid-content bg-purple-dark">
                         <el-form-item label="接班人:" prop="jie_ban_ren_">
@@ -387,7 +387,7 @@ export default {
 </script>
 <style scoped lang="less">
 .demo-ruleForm{
-   padding: 1% 5% 1% 1%;
+   padding: 1% 5% 1% 5%;
    .el-form-item {
     padding: 1% 0;
    }
@@ -395,5 +395,7 @@ export default {
     text-align: center;
    }
 }
-
+/deep/ .el-form-item__label{
+    text-align: left;
+}
 </style>

+ 15 - 110
src/views/infosManage/fileIE.vue

@@ -122,6 +122,7 @@
             :visible.sync="dialogVisible1"
             width="55%"
         >
+            <!-- <updateFille :son-data="sonData" /> -->
             <template #title>
                 <div style="width:100%;color:#555;text-align:center; font-size:20px;font-weight:600;">更新文件信息</div>
             </template>
@@ -137,7 +138,7 @@
                     </el-row>
                     <el-row :gutter="80" style="margin:2% 0">
                         <el-col :span="12"> <el-form-item label="原文件名称:">
-                            <div>{{ dialogForm.wen_jian_bian_hao?dialogForm.wen_jian_bian_hao:'/' }}</div>
+                            <div>{{ dialogForm.yuan_wen_jian_min?dialogForm.yuan_wen_jian_min:'/' }}</div>
                         </el-form-item></el-col>
                         <el-col :span="12"> <el-form-item label="新文件名称:">
                             <el-input v-model="dialogForm.xin_wen_jian_ming" placeholder="请输入内容" />
@@ -184,113 +185,12 @@
                             <el-input v-model="dialogForm.geng_xin_yuan_yin" placeholder="请输入内容" />
                         </el-form-item></el-col>
                     </el-row>
-                    <el-form-item class="footer-btn" style=" text-align: center;">
-                        <el-button type="primary" @click="dialogVisibleClick('dialogForm')">确定</el-button>
-                        <el-button @click="dialogVisible1 = false">取消</el-button>
-                    </el-form-item>
-
                 </el-form>
-
-                <!-- <el-form ref="dialogForm" :model="dialogForm" :rules="rules">
-                    <el-row :gutter="80" label-width="80" style="margin:2% 0">
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5"><div class="grid-content bg-purple">文件类型</div></el-col>
-                                <el-col :span="19"> {{ dialogForm.wen_jian_lei_xing?dialogForm.wen_jian_lei_xing:'/' }}</el-col>
-                            </el-row>
-                        </el-col>
-                        <el-col :span="12">
-
-                            <el-row :gutter="20">
-                                <el-col :span="5"><div class="grid-content bg-purple">文件编号</div></el-col>
-                                <el-col :span="19"><div class="grid-content bg-purple">{{ dialogForm.wen_jian_bian_hao?dialogForm.wen_jian_bian_hao:'/' }}</div></el-col>
-                            </el-row>
-
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="80" label-width="80" style="margin:2% 0">
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple">原文件名称</div></el-col>
-                                <el-col :span="19" style="margin-top:1%"><div class="grid-content bg-purple">{{ dialogForm.yuan_wen_jian_min?dialogForm.yuan_wen_jian_min:'/' }}</div></el-col>
-                            </el-row>
-
-                        </el-col>
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple">新文件名称</div></el-col>
-                                <el-col :span="19"><div class="grid-content bg-purple"><el-input v-model="dialogForm.xin_wen_jian_ming" placeholder="请输入内容" /></div></el-col>
-                            </el-row>
-
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="80" label-width="80" style="margin:2% 0">
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple"><span style="color:red">*</span>发布时间</div></el-col>
-                                <el-col :span="19">
-                                    <el-date-picker
-                                        v-model="dialogForm.fa_bu_shi_jian_"
-                                        :picker-options="{ disabledDate(time) { return time.getTime() > Date.now(); } }"
-                                        type="datetime"
-                                        placeholder="选择日期时间"
-                                        format="yyyy-MM-dd HH:mm"
-                                        value-format="yyyy-MM-dd HH:mm"
-                                        style="width:100%"
-                                    />
-                                </el-col>
-                            </el-row>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple"><span style="color:red">*</span>生效时间</div></el-col>
-                                <el-col :span="19">  <el-date-picker v-model="dialogForm.sheng_xiao_shi_" :picker-options="{ disabledDate(time) { return time.getTime() <= Date.now(); } }" type="date" placeholder="选择日期" style="width:100%" /></el-col>
-                            </el-row>
-
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="80" label-width="80" style="margin:2% 0">
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple"><span style="color:red">*</span>上传文件</div></el-col>
-                                <el-col :span="19"><div class="grid-content bg-purple">   <ibps-attachment
-                                    v-model="dialogForm.wen_jian_fu_jian_"
-                                    allow-download
-                                    download
-                                    multiple
-                                    accept="*"
-                                    store="id"
-                                    :readonly="false"
-                                /></div></el-col>
-                            </el-row>
-
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="80" label-width="80" style="margin:2% 0">
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple">更新内容</div></el-col>
-                                <el-col :span="19"><div class="grid-content bg-purple"> <el-input v-model="dialogForm.geng_xin_nei_rong" placeholder="请输入内容" /></div></el-col>
-                            </el-row>
-
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="80" label-width="80" style="margin:2% 0">
-                        <el-col :span="12">
-                            <el-row :gutter="20">
-                                <el-col :span="5" style="margin-top:1%"><div class="grid-content bg-purple">更新原因</div></el-col>
-                                <el-col :span="19"><div class="grid-content bg-purple"> <el-input v-model="dialogForm.geng_xin_yuan_yin" placeholder="请输入内容" /></div></el-col>
-                            </el-row>
-                        </el-col>
-                    </el-row>
-                    <el-form-item />
-                </el-form> -->
             </div>
-            <!-- <div slot="footer" class="dialog-footer" style="width:100%;text-align:center;">
-                <el-button @click="dialogVisible1 = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisibleClick()">确 定</el-button>
-            </div> -->
-
+            <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="dialogVisibleClick('dialogForm')">确定</el-button>
+                <el-button @click="dialogVisible1 = false">取消</el-button>
+            </span>
         </el-dialog>
     </div>
 </template>
@@ -310,6 +210,7 @@ import noColectPng from '@/assets/images/icons/noColect.png'
 import wordPng from '@/assets/images/icons/word.png'
 import fileTraining from '@/views/component/fileTraining'
 import column from '@/components/ibps-crud/mixin/column'
+// import updateFille from './updateFile.vue'
 
 export default {
     components: {
@@ -340,7 +241,7 @@ export default {
                 sheng_xiao_shi_: [{ required: true, message: this.$t('validate.required') }],
                 wen_jian_fu_jian_: [{ required: true, message: this.$t('validate.required') }]
             },
-
+            sonData: '',
             dialogVisible1: false,
             showCaoZuoColumn: false,
             dialogForm: {
@@ -518,6 +419,7 @@ export default {
         },
         // 外部文件更新
         updateDate (data) {
+            this.sonData = data
             console.log('data', data)
             this.dialogVisible1 = true
             this.dialogForm.wen_jian_lei_xing = data.row.wen_jian_xi_lei_
@@ -947,11 +849,14 @@ export default {
 /deep/ .el-tree-node__content {
   display: block;
 }
-.motaikuan{
-padding:1% 3%;
-.el-row{
+
+/deep/ .el-form-item__label{
     text-align: left;
 }
+
+/deep/ .el-dialog__footer{
+    display: flex;
+    justify-content: center;
 }
 
 </style>