66ce7671 by renchao@pashanhoo.com

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 36176622 37a063bc
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
139 <el-col> 139 <el-col>
140 <el-form-item v-if="ruleForm.slsq" label="登记原因:" prop="djyy"> 140 <el-form-item v-if="ruleForm.slsq" label="登记原因:" prop="djyy">
141 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1" 141 <el-input class="textArea" type="textarea" :disabled="$route.query.viewtype == 1"
142 v-model="ruleForm.slsq.djyy"> 142 v-model="ruleForm.fdcq2List[0].djyy">
143 </el-input> 143 </el-input>
144 </el-form-item> 144 </el-form-item>
145 </el-col> 145 </el-col>
......