From e07dcffaadd1a856ec0515c1aaae27c8398f851c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E5=AD=A6=E5=9D=A4?= <1107410514@qq.com>
Date: Wed, 27 Nov 2019 00:27:22 +0800
Subject: [PATCH] kun 191127 00:27

---
 .env.production                      |   2 +-
 src/App.vue                          |  36 ++++----
 src/components/AboutUs.vue           |  23 ++++-
 src/components/Cover.vue             |   4 +-
 src/components/DesiredEffect.vue     |   4 +-
 src/components/DivisionLabor.vue     |   4 +-
 src/components/ExistingBasis.vue     |   4 +-
 src/components/MethodsWay.vue        |   4 +-
 src/components/ProjectAssessment.vue |   4 +-
 src/components/ProjectBrief.vue      |   4 +-
 src/components/RichTextOne.vue       |   4 +-
 src/components/Scheduling.vue        |   4 +-
 src/views/project/Application.vue    | 133 ++++++++++++++++++---------
 vue.config.js                        |   2 +-
 14 files changed, 159 insertions(+), 73 deletions(-)

diff --git a/.env.production b/.env.production
index 8150bd8..376ae47 100644
--- a/.env.production
+++ b/.env.production
@@ -2,4 +2,4 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://chaoyang.yulongcode.com/api/'
\ No newline at end of file
+VUE_APP_BASE_API = 'http://cyteam.org.cn/api/'
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index a123d0b..f4eabcc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,25 +5,17 @@
 </template>
 
 <script>
-
 export default {
-  components: {
-
-  },
+  components: {},
   props: {},
   data () {
-    return {
-    }
+    return {}
   },
   computed: {},
-  watch: {
-  },
-  methods: {
-  },
-  created () {
-  },
-  mounted () {
-  },
+  watch: {},
+  methods: {},
+  created () {},
+  mounted () {},
   updated () {
     window.scroll(0, 0)
   }
@@ -44,9 +36,21 @@ export default {
 //   /*火狐下隐藏滚动条*/
 //   // scrollbar-width: none;
 // }
+
+// @font-face{
+//   font-family: "微软雅黑" !important;
+// }
+
+ /deep/ .w-e-text-container p {
+    color: red;
+}
+
 body {
   background-color: #fcfbfb;
 
+  // font {
+  //   font-family: "微软雅黑" !important;
+  // }
   // &::-webkit-scrollbar {
   //   width: 0px;
   //   height: 5px;
@@ -67,7 +71,7 @@ body {
   }
 }
 @font-face {
-  font-family: 'HanWangKaiBold-Gb5';
-  src: url('../static/fontFile/HanWangKaiBold-Gb5.ttf');
+  font-family: "HanWangKaiBold-Gb5";
+  src: url("../static/fontFile/HanWangKaiBold-Gb5.ttf");
 }
 </style>
diff --git a/src/components/AboutUs.vue b/src/components/AboutUs.vue
index f080155..416b0b2 100644
--- a/src/components/AboutUs.vue
+++ b/src/components/AboutUs.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="aboutUs"></div>
+  <div ref="aboutUs" id="aboutUs"></div>
 </template>
 
 <script>
@@ -20,9 +20,25 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(_this.$refs.aboutUs)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('aboutUs', html)
     }
+
+    // phoneEditor.customConfig.pasteTextHandle = function (content) {
+    //   // content 即粘贴过来的内容（html 或 纯文本），可进行自定义处理然后返回
+    //   if (content == '' && !content) return ''
+    //   var str = content
+    //   str = str.replace(/<xml>[\s\S]*?<\/xml>/ig, '')
+    //   str = str.replace(/<style>[\s\S]*?<\/style>/ig, '')
+    //   str = str.replace(/<\/?[^>]*>/g, '')
+    //   str = str.replace(/[ | ]*\n/g, '\n')
+    //   // str = str.replace(/&nbsp;/ig, '')
+    //   console.log('****', content)
+    //   console.log('****', str)
+    //   return str
+    // }
+
     phoneEditor.customConfig.menus = [
       'head', // 标题
       'bold', // 粗体
@@ -45,12 +61,14 @@ export default {
       'undo', // 撤销
       'redo' // 重复
     ]
+
     phoneEditor.create()
   },
   methods: {},
   computed: {},
   watch: {
     aboutUsVal (val) {
+      // console.log(val)
       phoneEditor.txt.html(val)
     }
   }
@@ -60,6 +78,7 @@ export default {
 <style lang="scss" scoped>
 #aboutUs {
   width: 100%;
-  height: 250px;
+  height: 250px !important;
+  font-family: "宋体" !important;
 }
 </style>
diff --git a/src/components/Cover.vue b/src/components/Cover.vue
index 273675d..ba6eb7f 100644
--- a/src/components/Cover.vue
+++ b/src/components/Cover.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="cover"></div>
+    <div ref="cover" id="cover"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.cover)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('cover', html)
     }
@@ -61,5 +62,6 @@ export default {
 #cover {
   width: 100%;
   height: 250px;
+  font-family: "宋体" !important;
 }
 </style>
diff --git a/src/components/DesiredEffect.vue b/src/components/DesiredEffect.vue
index 86ba350..ab67ece 100644
--- a/src/components/DesiredEffect.vue
+++ b/src/components/DesiredEffect.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="desiredEffect"></div>
+    <div ref="desiredEffect" id="desiredEffect"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.desiredEffect)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('desiredEffect', html)
     }
@@ -62,5 +63,6 @@ export default {
 #desiredEffect {
   width: 100%;
   height: 250px;
+  font-family: "宋体" !important;
 }
 </style>
diff --git a/src/components/DivisionLabor.vue b/src/components/DivisionLabor.vue
index d67451b..0a14cd1 100644
--- a/src/components/DivisionLabor.vue
+++ b/src/components/DivisionLabor.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="divisionLabor"></div>
+    <div ref="divisionLabor" id="divisionLabor"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.divisionLabor)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('divisionLabor', html)
     }
@@ -62,5 +63,6 @@ export default {
 #divisionLabor {
   width: 100%;
   height: 250px;
+  font-family:'宋体' !important;
 }
 </style>
diff --git a/src/components/ExistingBasis.vue b/src/components/ExistingBasis.vue
index 1c8e1ee..3107b6d 100644
--- a/src/components/ExistingBasis.vue
+++ b/src/components/ExistingBasis.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="existingBasis"></div>
+    <div ref="existingBasis" id="existingBasis"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.existingBasis)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('existingBasis', html)
     }
@@ -61,5 +62,6 @@ export default {
 #existingBasis {
   width: 100%;
   height: 250px;
+  font-family:'宋体' !important;
 }
 </style>
diff --git a/src/components/MethodsWay.vue b/src/components/MethodsWay.vue
index baaa375..907a3f5 100644
--- a/src/components/MethodsWay.vue
+++ b/src/components/MethodsWay.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="methodsWay"></div>
+    <div ref="methodsWay" id="methodsWay"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.methodsWay)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('methodsWay', html)
     }
@@ -61,5 +62,6 @@ export default {
 #methodsWay {
   width: 100%;
   height: 250px;
+  font-family:'宋体' !important;
 }
 </style>
diff --git a/src/components/ProjectAssessment.vue b/src/components/ProjectAssessment.vue
index ca47df8..6d314a0 100644
--- a/src/components/ProjectAssessment.vue
+++ b/src/components/ProjectAssessment.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="projectAssessment"></div>
+    <div ref="projectAssessment" id="projectAssessment"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.projectAssessment)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('projectAssessment', html)
     }
@@ -61,5 +62,6 @@ export default {
 #projectAssessment {
   width: 100%;
   height: 250px;
+  font-family:'宋体' !important;
 }
 </style>
diff --git a/src/components/ProjectBrief.vue b/src/components/ProjectBrief.vue
index f159608..4b74d23 100644
--- a/src/components/ProjectBrief.vue
+++ b/src/components/ProjectBrief.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="projectBrief"></div>
+    <div ref="projectBrief" id="projectBrief"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.projectBrief)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('projectBrief', html)
     }
@@ -61,5 +62,6 @@ export default {
 #projectBrief {
   width: 100%;
   height: 250px;
+  font-family:'宋体' !important;
 }
 </style>
diff --git a/src/components/RichTextOne.vue b/src/components/RichTextOne.vue
index fa19ef2..d396365 100644
--- a/src/components/RichTextOne.vue
+++ b/src/components/RichTextOne.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="editor"></div>
+  <div ref="editor" id="websiteEditorElem"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.editor)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('quillVal', html)
     }
@@ -62,5 +63,6 @@ export default {
 #websiteEditorElem {
   width: 100%;
   height: 250px;
+  font-family:'宋体' !important;
 }
 </style>
diff --git a/src/components/Scheduling.vue b/src/components/Scheduling.vue
index 4ba9281..aa25339 100644
--- a/src/components/Scheduling.vue
+++ b/src/components/Scheduling.vue
@@ -1,5 +1,5 @@
 <template>
-    <div ref="scheduling"></div>
+  <div ref="scheduling" id="scheduling"></div>
 </template>
 
 <script>
@@ -20,6 +20,7 @@ export default {
   mounted () {
     _this = this
     phoneEditor = new E(this.$refs.scheduling)
+    phoneEditor.customConfig.pasteFilterStyle = false
     phoneEditor.customConfig.onchange = html => {
       _this.$emit('scheduling', html)
     }
@@ -62,5 +63,6 @@ export default {
 #scheduling {
   width: 100%;
   height: 250px;
+  font-family: "宋体" !important;
 }
 </style>
diff --git a/src/views/project/Application.vue b/src/views/project/Application.vue
index 19647ff..b632a9a 100644
--- a/src/views/project/Application.vue
+++ b/src/views/project/Application.vue
@@ -844,7 +844,50 @@ export default {
     btn (index) {
       let s = this.sub
       s = index
-      this.sub = s
+      // this.sub = s;
+
+      let regd = /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/
+      let regs = /^(0|86|17951)?(13[0-9]|15[012356789]|166|17[3678]|18[0-9]|14[57])[0-9]{8}$/
+
+      if (
+        this.name === '' ||
+        this.company === '' ||
+        this.tid === '' ||
+        this.rid === '' ||
+        this.first_level === '' ||
+        this.secondary === '' ||
+        this.fieldeara === '' ||
+        this.attribute === '' ||
+        this.aterm === '' ||
+        this.fterm === '' ||
+        this.postaladdress === '' ||
+        this.postalcode === '' ||
+        this.pmail === '' ||
+        this.plegal === '' ||
+        this.plcode === '' ||
+        this.pname === '' ||
+        this.poster === '' ||
+        this.poffice_tel === '' ||
+        this.aphone === '' ||
+        this.cname === '' ||
+        this.cpost === '' ||
+        this.coffice_tel === '' ||
+        this.cphone === ''
+      ) {
+        alert('请认真核对填写内容完整性！')
+        return false
+      } else if (this.aterm > this.fterm) {
+        alert('截止日期应比申请日期晚')
+        return false
+      } else if (!regd.test(this.poffice_tel) || !regd.test(this.coffice_tel)) {
+        alert('请填写正确的电话号码！')
+        return false
+      } else if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+        alert('请填写正确的手机号码！')
+        return false
+      } else {
+        this.sub = s
+      }
     },
     /** 保存和提交 */
     submit (index) {
@@ -867,9 +910,9 @@ export default {
       this.funds = this.initialText
       this.proimages = [...this.fileLists, ...this.picture]
 
-      if (this.subStatus === 1) {
-        if (
-          this.name === '' ||
+      // if (this.subStatus === 1) {
+      if (
+        this.name === '' ||
           this.company === '' ||
           this.tid === '' ||
           this.rid === '' ||
@@ -912,55 +955,55 @@ export default {
           this.prodemofg === '' ||
           this.prodemotwo === '' ||
           this.funds === ''
-        ) {
-          alert('请认真核对填写内容完整性！')
-          return false
-        } else if (this.aterm > this.fterm) {
-          alert('截止日期应比申请日期晚')
-          return false
-        } else if (
-          !regd.test(this.poffice_tel) ||
+      ) {
+        alert('请认真核对填写内容完整性！')
+        return false
+      } else if (this.aterm > this.fterm) {
+        alert('截止日期应比申请日期晚')
+        return false
+      } else if (
+        !regd.test(this.poffice_tel) ||
           !regd.test(this.coffice_tel)
-        ) {
-          alert('请填写正确的电话号码！')
-          return false
-        } else if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
-          alert('请填写正确的手机号码！')
-          return false
-        } else if (
-          !regd.test(this.respoophone) ||
+      ) {
+        alert('请填写正确的电话号码！')
+        return false
+      } else if (!regs.test(this.aphone) || !regs.test(this.cphone)) {
+        alert('请填写正确的手机号码！')
+        return false
+      } else if (
+        !regd.test(this.respoophone) ||
           !regd.test(this.respocophone)
-        ) {
-          alert('请填写正确的电话号码！')
-          return false
-        } else if (this.thff === false) {
-          alert('请同意：申报单位承诺')
-          return false
-        } else if (this.proimages.length === 0) {
-          alert('未上传文件！')
-          return false
-        }
-
-        if (this.respoptel !== '' && !regs.test(this.respoptel)) {
-          alert('请填写正确的手机号码！')
-          return false
-        }
-        if (this.respoctel !== '' && !regs.test(this.respoctel)) {
-          alert('请填写正确的手机号码！')
-          return false
-        }
+      ) {
+        alert('请填写正确的电话号码！')
+        return false
+      } else if (this.thff === false) {
+        alert('请同意：申报单位承诺')
+        return false
+      } else if (this.proimages.length === 0) {
+        alert('未上传文件！')
+        return false
       }
 
+      if (this.respoptel !== '' && !regs.test(this.respoptel)) {
+        alert('请填写正确的手机号码！')
+        return false
+      }
+      if (this.respoctel !== '' && !regs.test(this.respoctel)) {
+        alert('请填写正确的手机号码！')
+        return false
+      }
+      // }
+
       let val = this.proimages
       val = JSON.stringify(this.proimages)
       this.proimages = val
 
-      if (this.subStatus === 1) {
-        if (this.proimages === '') {
-          alert('文件还未上传！')
-          return false
-        }
+      // if (this.subStatus === 1) {
+      if (this.proimages === '') {
+        alert('文件还未上传！')
+        return false
       }
+      // }
 
       this.popupStatus = true
     },
@@ -1211,8 +1254,10 @@ export default {
 
 <style lang="scss" scoped>
 .rich {
+  z-index: 10;
   width: 100%;
   margin: 30px auto 0px;
+  height: 320px;
 }
 .img-img {
   margin-top: 25px;
diff --git a/vue.config.js b/vue.config.js
index 8dcbf39..7c6a676 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,7 +12,7 @@
     hotOnly: false,
     proxy: {
       '/url/': {
-        target: 'http://chaoyang.yulongcode.com/api/',
+        target: 'http://cyteam.org.cn/api/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {