|
@@ -337,7 +337,7 @@
|
|
<a-form>
|
|
<a-form>
|
|
<a-col :xl='24' :lg='24' :md='24' :sm='24' :xs='24'>
|
|
<a-col :xl='24' :lg='24' :md='24' :sm='24' :xs='24'>
|
|
<a-form-item required :label="$t('base.info.reason-for-not-conducting-the-experiment')">
|
|
<a-form-item required :label="$t('base.info.reason-for-not-conducting-the-experiment')">
|
|
- <a-textarea rows='6' v-model="editParam.notCarryOutCause" style="width: 100%;" :placeholder="$t('base.info.please-enter-reason-for-not-conducting-the-experiment')" :maxLength='500'></a-textarea>
|
|
|
|
|
|
+ <a-textarea rows='6' v-model="editParam.notCarryOutCause" style="width: 100%;" :placeholder="$t('base.info.please-enter-reason-for-not-conducting-the-experiment')" :maxLength='50'></a-textarea>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
</a-form>
|
|
</a-form>
|
|
@@ -1081,7 +1081,7 @@ export default {
|
|
// this.editParam = val;
|
|
// this.editParam = val;
|
|
//所以这样写 this.editParam = {...val};
|
|
//所以这样写 this.editParam = {...val};
|
|
//或者如下写,挨个赋值
|
|
//或者如下写,挨个赋值
|
|
- this.editParam.isCarryOut = val.isCarryOut || undefined;
|
|
|
|
|
|
+ this.editParam.isCarryOut = (val.isCarryOut === 0 || val.isCarryOut === 1) ? val.isCarryOut : undefined;
|
|
this.editParam.systemName = val.systemName;
|
|
this.editParam.systemName = val.systemName;
|
|
this.editParam.assets = val.assets;
|
|
this.editParam.assets = val.assets;
|
|
this.editParam.verify = val.verify;
|
|
this.editParam.verify = val.verify;
|
|
@@ -1279,6 +1279,7 @@ export default {
|
|
*/
|
|
*/
|
|
handleCarryOut(val){
|
|
handleCarryOut(val){
|
|
this.editParam.isCarryOut = val;
|
|
this.editParam.isCarryOut = val;
|
|
|
|
+ // 当选择了不开展试验 val=0,开展试验表单标志causeShowFlag = false,不开展试验表单显示
|
|
if (val === 0) {
|
|
if (val === 0) {
|
|
this.causeShowFlag = false;
|
|
this.causeShowFlag = false;
|
|
} else {
|
|
} else {
|