Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -90,6 +90,14 @@ export default {
   padding: 3px !important;
 }
 
+/deep/.el-calendar-table td.is-today {
+  font-weight: 700;
+}
+
+/deep/.el-calendar-table td.is-selected {
+  background-color: rgb(179, 216, 255);
+}
+
 /deep/.el-calendar__header {
   padding: 8px 15px;
 }
@@ -141,9 +149,9 @@ export default {
 }
 
 /**本月周末设置为红色*/
-.el-calendar-table .current:nth-last-child(-n+2) .solar {
+/* .el-calendar-table .current:nth-last-child(-n+2) .solar {
   color: red;
-}
+} */
 
 /**本月农历设置为灰色*/
 .el-calendar-table .current .lunar {

@@ -147,7 +147,7 @@ MessageBox.setDefaults = defaults => {
   MessageBox.defaults = defaults;
 };
 
-MessageBox.alert = (message, title, options) => {
+MessageBox.alert = (title, message, options) => {
   if (typeof title === 'object') {
     options = title;
     title = '';

@@ -5,22 +5,13 @@
       <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
         <div class="el-message-box__content">
           <div class="el-message-box__container">
-            <p v-if="title !== null">{{ title }}</p>
-            <div class="el-message-box__message" v-if="message !== ''">
-              <slot>
-                <p v-html="message"></p>
-              </slot>
-            </div>
-            <div class="postscript">
-              
-              <el-button type="text">下载</el-button>
-            </div>
+            <div v-if="title !== ''" class="message-title">标题：{{ title }}</div>
+            <div v-if="message !== ''" class="richText" v-html="message"></div>
           </div>
         </div>
         <div class="el-message-box__btns">
-          <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" v-if="showCancelButton"
-            :round="roundButton" size="small" @click.native="handleAction('cancel')"
-            @keydown.enter="handleAction('cancel')">
+          <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small"
+            @click.native="handleAction('cancel')" @keydown.enter="handleAction('cancel')">
             {{ cancelButtonText || t('el.messagebox.cancel') }}
           </el-button>
         </div>
@@ -205,11 +196,6 @@ export default {
     visible (val) {
       if (val) {
         this.uid++;
-        if (this.$type === 'alert' || this.$type === 'confirm') {
-          this.$nextTick(() => {
-            this.$refs.confirm.$el.focus();
-          });
-        }
         this.focusAfterClosed = document.activeElement;
         messageBox = new Dialog(this.$el, this.focusAfterClosed, this.getFirstFocus());
       }
@@ -281,3 +267,20 @@ export default {
   }
 };
 </script>
+<style scoped>
+/deep/.el-message-box {
+  width: 500px;
+  max-height: 95%;
+}
+
+/deep/.message-title {
+  font-size: 18px;
+  font-weight: 700;
+  margin-bottom: 5px;
+}
+
+/deep/.el-message-box__content img {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file

@@ -90,6 +90,14 @@ export default {
   padding: 3px !important;
 }
 
+/deep/.el-calendar-table td.is-today {
+  font-weight: 700;
+}
+
+/deep/.el-calendar-table td.is-selected {
+  background-color: rgb(179, 216, 255);
+}
+
 /deep/.el-calendar__header {
   padding: 8px 15px;
 }
@@ -141,9 +149,9 @@ export default {
 }
 
 /**本月周末设置为红色*/
-.el-calendar-table .current:nth-last-child(-n+2) .solar {
+/* .el-calendar-table .current:nth-last-child(-n+2) .solar {
   color: red;
-}
+} */
 
 /**本月农历设置为灰色*/
 .el-calendar-table .current .lunar {

@@ -243,9 +243,7 @@ export default {
       chart.render();
     },
     handleNotice (item) {
-      console.log(item);
-      this.$alertMes('9999999999')
-      //setReadStatus({'bsmNotice':bsmNotice})
+      this.$alertMes(item.noticeTitle, item.noticeContent)
     }
   }
 }

 <template>
-  <dialogBox title="申请人信息" width="60%" isMain v-model="myValue" :isFullscreen="false" @submitForm="submitForm"
-    @closeDialog="closeDialog">
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
+  <dialogBox
+    title="申请人信息"
+    width="60%"
+    isMain
+    v-model="myValue"
+    :isFullscreen="false"
+    @submitForm="submitForm"
+    @closeDialog="closeDialog"
+  >
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="120px"
+    >
       <el-row>
         <el-col :span="8">
           <el-form-item label="权利人类型" prop="sqrlx">
-            <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
-              <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+            <el-select
+              clearable
+              v-model="ruleForm.sqrlx"
+              class="width100"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in dictData['A36']"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -18,8 +40,18 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="证件种类" prop="zjzl">
-            <el-select clearable v-model="ruleForm.zjzl" class="width100" placeholder="请选择">
-              <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+            <el-select
+              clearable
+              v-model="ruleForm.zjzl"
+              class="width100"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in dictData['A30']"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -38,8 +70,18 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="性别">
-            <el-select clearable v-model="ruleForm.xb" class="width100" placeholder="请选择">
-              <el-option v-for="item in dictData['A43']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+            <el-select
+              clearable
+              v-model="ruleForm.xb"
+              class="width100"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in dictData['A43']"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -120,8 +162,18 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="代理人证件类型">
-            <el-select clearable v-model="ruleForm.dlrzjlx" class="width100" placeholder="请选择">
-              <el-option v-for="item in dictData['A30']" :key="item.dcode" :label="item.dname" :value="item.dcode">
+            <el-select
+              clearable
+              v-model="ruleForm.dlrzjlx"
+              class="width100"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in dictData['A30']"
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -138,74 +190,64 @@
   </dialogBox>
 </template>
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 export default {
   props: {
     value: { type: Boolean, default: false },
-    details: { type: Object, default: {} }
+    details: { type: Object, default: {} },
   },
   computed: {
     ...mapGetters(["dictData"]),
   },
-  data () {
+  data() {
     return {
       myValue: this.value,
       ruleForm: {
-        sqrlx: '',
-        sqrmc: '',
-        zjzl: '',
-        zjh: '',
-        dh: '',
-        xb: '',
-        frmc: '',
-        gjdq: '',
-        szss: '',
-        dz: '',
-        yb: '',
-        fzjg: '',
-        dzyj: '',
-        qlbl: '',
-        gzdw: '',
-        dljg: '',
-        dlrxm: '',
-        dlrzjlx: '',
-        dlrzjh: ''
+        sqrlx: "",
+        sqrmc: "",
+        zjzl: "",
+        zjh: "",
+        dh: "",
+        xb: "",
+        frmc: "",
+        gjdq: "",
+        szss: "",
+        dz: "",
+        yb: "",
+        fzjg: "",
+        dzyj: "",
+        qlbl: "",
+        gzdw: "",
+        dljg: "",
+        dlrxm: "",
+        dlrzjlx: "",
+        dlrzjh: "",
       },
       rules: {
-        sqrlx: [
-          { required: true, message: '权利人类型', trigger: 'change' }
-        ],
-        sqrmc: [
-          { required: true, message: '姓名/名称', trigger: 'blur' }
-        ],
-        zjzl: [
-          { required: true, message: '证件种类', trigger: 'change' }
-        ],
-        zjh: [
-          { required: true, message: '证件号', trigger: 'blur' }
-        ]
-      }
-    }
+        sqrlx: [{ required: true, message: "权利人类型", trigger: "change" }],
+        sqrmc: [{ required: true, message: "姓名/名称", trigger: "blur" }],
+        zjzl: [{ required: true, message: "证件种类", trigger: "change" }],
+        zjh: [{ required: true, message: "证件号", trigger: "blur" }],
+      },
+    };
   },
   watch: {
-    value (val) {
-      this.myValue = _.cloneDeep(val)
+    value(val) {
+      this.myValue = _.cloneDeep(val);
     },
     details: {
       handler: function (val, oldVal) {
-        this.ruleForm = val
+        this.ruleForm = val;
       },
-      deep: true
-    }
+      deep: true,
+    },
   },
   methods: {
-    closeDialog () {
+    closeDialog() {
       this.$emit("input", false);
-      this.$refs['ruleForm'].resetFields();
+      this.$refs["ruleForm"].resetFields();
     },
-    submitForm () {
-      this.$emit("input", false);
-      this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
+    submitForm() {
       // this.$refs['ruleForm'].validate((valid) => {
       //   if (valid) {
       //     this.$message({
@@ -217,9 +259,18 @@ export default {
       //     this.$message.error('请完善必填项');
       //   }
       // })
-    }
-  }
-}
+
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.$emit("input", false);
+          this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
 </script>
 <style scoped lang="scss">
 .submit-button {

@@ -304,6 +304,7 @@ export default {
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;
+        this.ruleForm.diyaq.sfczjzhxz="0";
       }
     });
   },

@@ -304,6 +304,7 @@ export default {
     Init(formdata).then((res) => {
       if (res.code === 200 && res.result) {
         this.ruleForm = res.result;
+        this.ruleForm.diyaq.sfczjzhxz="0";
       }
     });
   },