fix：[试验管理][填报，预填，申请，计划]编辑优化

src/lang/en/business/study/studyFormApply.js

@@ -13,6 +13,7 @@ export default {
  zc:'暂存',
  next:'Next',
  save:'Save',
+ pre:'Pre',
  submit:'Submit',
  bdnr:'表单内容',
  qmxx:'签名信息',

src/lang/en/business/study/studyFormFill.js

@@ -13,6 +13,7 @@ export default {
  zc:'暂存',
  next:'Next',
  save:'Save',
+ pre:'Pre',
  submit:'Submit',
  bdnr:'表单内容',
  qmxx:'签名信息',

src/lang/en/business/study/studyFormPlan.js

@@ -10,6 +10,7 @@ export default {
   zc: '暂存',
  next:'Next',
  save:'Save',
+ pre:'Pre',
  submit:'Submit',
   bdnr: '表单内容',
   qmxx: '签名信息',

src/lang/en/business/study/studyFormPre.js

@@ -14,6 +14,7 @@ export default {
  reject:'Reject',
  shtg:'审核通过',
  shjj:'审核拒绝',
+ pre:'Pre',
  tb:'填报',
  bdnr:'表单内容',
  qmxx:'签名信息',

src/lang/zh/business/study/studyFormApply.js

@@ -12,6 +12,7 @@ export default {
  bdsm:'表单说明',
  zc:'暂存',
  next:'下一步',
+ pre:'上一步',
  save:'保存',
  submit:'提交',
  bdnr:'表单内容',

src/lang/zh/business/study/studyFormFill.js

@@ -12,6 +12,7 @@ export default {
  bdsm:'表单说明',
  zc:'暂存',
  next:'下一步',
+ pre:'上一步',
  save:'保存',
  submit:'提交',
  bdnr:'表单内容',

src/lang/zh/business/study/studyFormPlan.js

@@ -9,6 +9,7 @@ export default {
   bdsm: '表单说明',
   zc: '暂存',
   next: '下一步',
+ pre:'上一步',
   save: '保存',
   submit: '提交',
   bdnr: '表单内容',

src/lang/zh/business/study/studyFormPre.js

@@ -4,6 +4,7 @@ export default {
  xzbd:'新增表单',
  zc:'暂存',
  next:'下一步',
+ pre:'上一步',
  save:'保存',
  submit:'提交',
  bdsm:'表单说明',

src/views/business/comps/select/SelectTemplate.vue

@@ -2,7 +2,8 @@
 
 <template>
   <div>
-    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectTemplate" />
+    {{ readOnly }}
+    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" :disabled="disabled" @click.native="showSelectTemplate" />
     <SelectTemplateDialog ref="selectTemplateDialog" @callback="handleChange" />
   </div>
 </template>
@@ -21,7 +22,7 @@ export default {
       type: String,
       default: ''
     },
-    readOnly: {
+    disabled: {
       type: Boolean,
       default: false
     },
@@ -56,7 +57,7 @@ export default {
   },
   methods: {
     showSelectTemplate(){
-      if(!this.readOnly){
+      if(!this.disabled){
         this.$refs.selectTemplateDialog.show({needPre:this.needPre})
       }
     },

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

@@ -31,6 +31,7 @@
             <el-button @click="saveNext">{{ $t('page.business.study.studyFormPlan.save') }}</el-button>
             <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormPlan.submit')
             }}</el-button>
+            <el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormPlan.pre') }}</el-button>
           </template>
         </div>
       </div>
@@ -40,7 +41,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :needPre="1" :name="form.templateMc" @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" :needPre="1"
+                    :name="form.templateMc" @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -137,7 +139,9 @@ export default {
   created() {
   },
   methods: {
-   
+    pre() {
+      this.showIndex = 1
+    },
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -147,7 +151,7 @@ export default {
     },
     selectTemplateChange(val) {
       this.form.bdnr = val.content
-      this.form.bdmc=val.name
+      this.form.bdmc = val.name
       this.form.templateMc = val.name
       this.form.templateSn = val.sn
     },
@@ -176,8 +180,8 @@ export default {
     },
     edit(row) {
       this.reset()
-      this.showIndex = 1
       if (row && row.id) {
+        this.showIndex = 2
         this.$modal.loading()
         studyFormPlan_info({ id: row.id }).then(response => {
           this.form = response.data
@@ -186,6 +190,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
+        this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.open = true
       }

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

@@ -31,6 +31,7 @@
             <el-button @click="saveNext">{{ $t('page.business.study.studyFormApply.save') }}</el-button>
             <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormApply.submit')
             }}</el-button>
+            <el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormApply.pre') }}</el-button>
           </template>
         </div>
       </div>
@@ -40,7 +41,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''"
+                    :name="form.templateMc" @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -54,10 +56,10 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormApply.sfbl')" prop="sfbl">
-                    <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')" >
-                  <el-option :label="$t('page.business.study.studyFormApply.yes')" :value="10" />
-                  <el-option :label="$t('page.business.study.studyFormApply.no')" :value="1" />
-                </el-select>
+                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')">
+                    <el-option :label="$t('page.business.study.studyFormApply.yes')" :value="10" />
+                    <el-option :label="$t('page.business.study.studyFormApply.no')" :value="1" />
+                  </el-select>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -152,7 +154,9 @@ export default {
   created() {
   },
   methods: {
-   
+    pre() {
+      this.showIndex = 1
+    },
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -161,7 +165,7 @@ export default {
       })
     },
     selectTemplateChange(val) {
-      this.form.bdmc=val.name
+      this.form.bdmc = val.name
       this.form.bdnr = val.content
       this.form.templateMc = val.name
       this.form.templateSn = val.sn
@@ -192,8 +196,8 @@ export default {
     },
     edit(row) {
       this.reset()
-      this.showIndex = 1
       if (row && row.id) {
+        this.showIndex = 2
         this.$modal.loading()
         studyFormApply_info({ id: row.id }).then(response => {
           this.form = response.data
@@ -202,6 +206,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
+        this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.open = true
       }

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

@@ -31,6 +31,7 @@
             <el-button @click="saveNext">{{ $t('page.business.study.studyFormFill.save') }}</el-button>
             <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormFill.submit')
             }}</el-button>
+            <el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormFill.pre') }}</el-button>
           </template>
         </div>
       </div>
@@ -40,8 +41,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId"  :name="form.templateMc" @change="selectTemplateChange"
-                    :needPre="1" />
+                  <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''" :name="form.templateMc"
+                    @change="selectTemplateChange" :needPre="1" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -55,7 +56,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')" prop="sfbl">
-                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')">
+                  <el-select v-model="form.sfbl" :placeholder="$t('form.placeholderSelect')" :disabled="form.id && form.id !== ''">
                     <el-option :label="$t('page.business.study.studyFormFill.yes')" :value="10" />
                     <el-option :label="$t('page.business.study.studyFormFill.no')" :value="1" />
                   </el-select>
@@ -153,7 +154,9 @@ export default {
   created() {
   },
   methods: {
-   
+    pre() {
+      this.showIndex = 1
+    },
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -164,7 +167,7 @@ export default {
     selectTemplateChange(val) {
       this.form.bdnr = val.content
       this.form.templateMc = val.name
-      this.form.bdmc=val.name
+      this.form.bdmc = val.name
       this.form.templateSn = val.sn
     },
     cancel() {
@@ -193,8 +196,8 @@ export default {
     },
     edit(row) {
       this.reset()
-      this.showIndex = 1
       if (row && row.id) {
+        this.showIndex = 2
         this.$modal.loading()
         studyFormFill_info({ id: row.id }).then(response => {
           this.form = response.data
@@ -203,6 +206,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
+        this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.open = true
       }

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

@@ -31,6 +31,7 @@
             <el-button @click="saveNext">{{ $t('page.business.study.studyFormPre.save') }}</el-button>
             <el-button type="primary" @click="showtj">{{ $t('page.business.study.studyFormPre.submit')
             }}</el-button>
+            <el-button type="primary" @click="pre">{{ $t('page.business.study.studyFormPre.pre') }}</el-button>
           </template>
         </div>
       </div>
@@ -40,14 +41,15 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmb')" prop="templateId">
-                  <SelectTemplate v-model="form.templateId" :needPre="10" :name="form.templateMc" @change="selectTemplateChange" />
+                  <SelectTemplate v-model="form.templateId" :disabled="form.id&&form.id!==''" :needPre="10" :name="form.templateMc"
+                    @change="selectTemplateChange" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.bdmc')" prop="bdmc">
-                  <el-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                  <el-input type="text"  v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -63,7 +65,7 @@
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" :sn="form.templateSn"  :templateData="form" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="preFill" />
         </div>
       </div>
     </div>
@@ -185,7 +187,9 @@ export default {
   created() {
   },
   methods: {
-   
+    pre(){
+          this.showIndex = 1
+    },
     next() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -196,7 +200,7 @@ export default {
     selectTemplateChange(val) {
       this.form.bdnr = val.content
       this.form.templateMc = val.name
-      this.form.bdmc=val.name
+      this.form.bdmc = val.name
       this.form.templateSn = val.sn
     },
     cancel() {
@@ -224,8 +228,8 @@ export default {
     },
     edit(row) {
       this.reset()
-      this.showIndex = 1
       if (row && row.id) {
+        this.showIndex = 2
         this.$modal.loading()
         studyFormPre_info({ id: row.id }).then(response => {
           this.form = response.data
@@ -236,6 +240,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
+        this.showIndex = 1
         this.form = _.merge({}, this.form, row)
         this.open = true
       }

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-         target: `http://39.99.251.173:8080`,
+         target: `http://localhost:8080`,
+        // target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''