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" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK" @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 == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @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">
@@ -360,7 +360,7 @@
                             <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" :disabled="(msg.TemplateId == 43 || msg.TemplateId == 48 || msg.TemplateId == 46 || msg.TemplateId == 53) && !ZhuiJiaTK" @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 == 56 || msg.TemplateId == 53) && !ZhuiJiaTK" @keyup.native="checkPrice(detailList,'UnitPrice',true)"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
                         </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">

src/plug/index.js

@@ -114,8 +114,8 @@ export default {
         let domainUrl = '';
         // domainUrl = "http://testapi.oytour.com";
         // domainUrl = "http://192.168.2.214:8082";
-        // domainUrl = "http://192.168.2.65:8025";
-        domainUrl = "http://192.168.2.16:8083";
+        domainUrl = "http://192.168.2.65:8025";
+        // domainUrl = "http://192.168.2.16:8083";
         let locationName = window.location.hostname;
 
         let javaUrldo="";
@@ -522,7 +522,8 @@ export default {
 
       //PDF预览
       Vue.prototype.previewPDF = function (url) {
-        window.open(this.domainManager().PDFViewUrl + url);
+        // window.open(this.domainManager().PDFViewUrl + url);
+        window.open(url);
       },
       //文件下载
       Vue.prototype.downloadFile = function (objectKey) {