fix：[试验管理][计划表单]

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

@@ -10,7 +10,7 @@ export default {
  qrfz:'确认废止',
  gc:'观察',
  bdsm:'表单说明',
- zc:'Save',
+ zc:'暂存',
  next:'下一步',
  pre:'上一步',
  save:'保存',

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

@@ -2,7 +2,8 @@
 
 <template>
   <div>
-    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" :disabled="disabled" @click.native="showStudy" />
+    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" :disabled="disabled"
+      @click.native="showStudy" />
     <SelectStudyDialog ref="selectStudyDialog" @callback="handleChange" />
   </div>
 </template>
@@ -11,13 +12,13 @@
 import SelectStudyDialog from './SelectStudyDialog.vue'
 export default {
   name: "SelectStudy",
-  components: {SelectStudyDialog},
+  components: { SelectStudyDialog },
   props: {
     value: {
-      type: [Number, String , Array],
+      type: [Number, String, Array],
       default: ''
     },
-    name: {
+    selectkey: {
       type: String,
       default: ''
     },
@@ -34,36 +35,30 @@ export default {
     value: {
       immediate: true,
       handler(v) {
-        this.selected.id = v ?((v+'').indexOf('u_')>-1? v:('u_'+v)):''
+        this.selected.id = v ? ((v + '').indexOf('u_') > -1 ? v : ('u_' + v)) : ''
       }
-    },
-    name: {
-      immediate: true,
-      handler(v) {
-        this.selected.name=v || ''
-      }
-    },
+    }
   },
   data() {
     return {
-      selected:{
-        id:'',
-        name:''
+      selected: {
+        id: '',
+        name: ''
       },
     };
   },
   mounted() {
   },
   methods: {
-    showStudy(){
-      if(!this.disabled){
-        this.$refs.selectStudyDialog.show({needPre:this.needPre})
+    showStudy() {
+      if (!this.disabled) {
+        this.$refs.selectStudyDialog.show({ needPre: this.needPre })
       }
     },
     handleChange(obj) {
-      this.selected.name=obj.name
-      this.selected.id=obj.id
-      this.$emit('change', obj)
+      this.selected.name = obj.name
+      this.selected.id = obj.id
+      this.$emit('change', _.merge({}, obj, { key: this.selectkey }))
       this.$emit('input', obj.id)
     },
   }

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

@@ -36,7 +36,8 @@
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="250px">
                   <template slot-scope="scope">
-                      <SelectStudy v-model="scope.row.mdIds"  />
+                    <SelectStudy v-model="scope.row.mdIds" :selectkey="scope.row.id + ''"
+                      @change="selectStudyChangeBatch" />
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('form.remark')" align="center" width="250px">
@@ -77,7 +78,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.nd')">
                 <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                    }}</template>
+                }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -98,7 +99,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.ckl')">
                 <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                    }}</template>
+                }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -111,7 +112,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.md')" prop="mdIds">
-               <SelectStudy v-model="form.mdIds"  @change="selectStudyChange" />
+                <SelectStudy v-model="form.mdIds" @change="selectStudyChange" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -155,7 +156,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr1')" prop="ffr1Id">
-              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id"  />
+              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -168,7 +169,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr2')" prop="ffr2Id">
-              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id"   />
+              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -204,7 +205,7 @@ import SelectStudy from '@/views/business/comps/select/SelectStudy';
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser ,SelectStudy},
+  components: { SelectList, SelectDeptUser, SelectStudy },
   data() {
     return {
       isBatch: false,
@@ -279,9 +280,19 @@ export default {
   created() {
   },
   methods: {
-    selectStudyChange(val){
-       this.form.mdMcs=val.name
-       this.form.mdOther=val.other
+    selectStudyChange(val) {
+      this.form.mdMcs = val.name
+      this.form.mdOther = val.mdOther
+    },
+    selectStudyChangeBatch(val) {
+      let that = this
+      if (val && val.id && val.id !== '') {
+        const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key })
+        if (_index > -1) {
+          that.selectList[_index].mdMcs = val.name
+          that.selectList[_index].mdOther = val.mdOther
+        }
+      }
     },
     handleSc(row) {
       const that = this

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

@@ -20,9 +20,9 @@
 
                 <el-table-column :label="$t('page.business.resource.gyzj.ffzytj')" align="center" prop="ffzytj"
                   width="150px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" prop="ckmz"
+                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" prop="ckl"
                   width="150px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckmzdw')" align="center" prop="ckmzdw"
+                <el-table-column :label="$t('page.business.resource.gyzj.ckldw')" align="center" prop="ckldw"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
                   width="150px" />
@@ -33,8 +33,14 @@
                 <el-table-column :label="$t('page.business.resource.gyzj.ffr2')" align="center" prop="ffr2Mc"
                   width="150px" />
                 <el-table-column :label="$t('form.remark')" align="center" prop="ffbz" width="150px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" prop="ffxmMc"
-                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <span
+                      v-if="scope.row.mdOther && scope.row.mdOther != '' && scope.row.mdMcs && scope.row.mdMcs != ''">{{
+                      scope.row.mdMcs }}{{ scope.row.mdOther }}</span>
+                    <span v-else>{{ scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-col>
           </el-row>

src/views/business/study/comp/jhbdList.vue

@@ -138,7 +138,7 @@ export default {
       handler(newVal) {
         this.searchForm.studySn = newVal.sn
         this.searchForm.studyMc = newVal.name
-        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.search()
       },

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

@@ -228,6 +228,7 @@ export default {
     },
     edit(row) {
       this.reset()
+      debugger
       if (row && row.id) {
         this.showIndex = 2
         this.$modal.loading()