Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/addFinancialDocuments.vue

@@ -321,7 +321,7 @@
                             </td> -->
                             <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)"  @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
                             <td height="26px">
-                                <el-input v-model="da.UnitPrice"  type="text" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
+                                <el-input v-model="da.UnitPrice"  type="text" :disabled="msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
                             </td>
                             <td height="26px">
                                 <el-select  filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
@@ -357,12 +357,12 @@
                             <input v-model="detailList.UnitPrice" type="text" @keydown="handleInput2" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input>
                         </td> -->
                         <td>
-                            <el-input v-model="detailList.Number" type="text" @keyup.native="checkInteger(detailList,'Number')"  @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
+                            <el-input v-model="detailList.Number" type="text"  @keyup.native="checkInteger(detailList,'Number')"  @blur="addList(1)" @change="Calculation(1)" class="w80 _border_b_1"></el-input>
                         </td>
                         <td>
-                            <el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
+                            <el-input v-model="detailList.UnitPrice" type="text" :disabled="msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
                         </td>
-                        <td>
+                        <td>  
                             <el-select  filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
                                 <el-option v-for='item in coinGetList'
                                     :label='item.Name'

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -236,7 +236,7 @@
                             <td height="26px"><el-input v-model="da.Number" @keyup.native="checkInteger(da,'Number')" type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 _border_b_1"></el-input></td>
                             <td height="26px">
                                 <el-input v-model="da.UnitPrice"  type="text" @keyup.native="checkPrice(da,'UnitPrice',true)"  @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
-                            </td>
+                            </td>  
                             <td height="26px">
                                 <span  class="w80">{{da.currenName}}</span>
                             </td>