Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

.env.development

@@ -7,7 +7,7 @@ ENV = 'development'
 # 华西海圻管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
-VUE_APP_FILE_DOMAIN = 'http://127.0.0.1:9300'
+VUE_APP_FILE_DOMAIN = 'http://39.99.251.173:9300'
 
 
 # 路由懒加载

src/components/Template/HandleFormItem.vue

@@ -353,8 +353,8 @@ export default {
             // 值发生了变化，需要弹出密码输入框
             const isSame = this.isEqual(this.oldValue, this.inputValue);
             if (this.oldValue && !isSame && this.templateFillType === "actFill") {
-                // this.$refs.editSignRef.show()
-                this.handleUpdateRecord();
+                this.$refs.editSignRef.show()
+                // this.handleUpdateRecord();
             }else{//如果是第一次填写，不需要密码验证
                 this.handleUpdateRecord()
             }

src/views/business/resource/gyzj/comps/gyzj/Xq.vue

@@ -200,7 +200,7 @@ export default {
    exportExcel() {
       this.$modal.loading()
       exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0] }).then(response => {
-        window.open(this.baseUrl +response.msg)
+        window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/resource/mjy/comps/mjy/Xq.vue

@@ -173,7 +173,6 @@ export default {
   components: { JcgjList },
   data() {
     return {
-      baseUrl:process.env.VUE_APP_FILE_DOMAIN,
       form: {},
       tzList: [],
       totalTz: 0,
@@ -199,7 +198,7 @@ export default {
     exportExcel() {
       this.$modal.loading()
       exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0]  }).then(response => {
-        window.open(this.baseUrl +response.msg)
+        window.open(process.env.VUE_APP_FILE_DOMAIN  +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/study/comp/tbbd/Xq.vue

@@ -195,7 +195,7 @@ export default {
     exportExcel(jcgjlx) {
       this.$modal.loading()
       studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx ,lang: this.$store.getters.language.split("_")[0]})).then(response => {
-        window.open(this.baseUrl + response.msg)
+        window.open(process.env.VUE_APP_FILE_DOMAIN  + response.msg)
         this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/study/comp/ytbd/Bj.vue

@@ -161,7 +161,7 @@ export default {
         }],
         fzrsh: [{
           required: true,
-          message: ' ',
+          message: this.$t('form.placeholderSelect'),
           trigger: 'blur'
         }],
         shryId: [{