save

src/components/SalesModule/signedFinance.vue

@@ -949,19 +949,20 @@ input[type="number"] {
                             popper-class="detailsIT_Journal"
                             placement="bottom-start"
                             trigger="click">
-                                <template v-if="item.Type!=1&&item.Type!=7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                <template v-if="item.Type!=1&&item.Type!=7&&(item.Is_Merge==0||item.Is_Merge===null)">
                                     <my-Bill :ID="item.FrID" :width="widthSon" :color="colorSon"></my-Bill>
                                 </template>
-                                <template v-else-if="item.Type==1&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                <template v-else-if="item.Type==1&&(item.Is_Merge==0||item.Is_Merge===null)">
                                     <my-RVB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
                                 </template>
-                                <template v-else-if="item.Type==7&&item.modelShow&&(item.Is_Merge===0||item.Is_Merge===null)">
+                                <template v-else-if="item.Type==7&&(item.Is_Merge==0||item.Is_Merge===null)">
                                     <my-GZ-Bill :ID="item.FrID" :width="'1000px'"  :color="colorSon"></my-GZ-Bill>
                                 </template>
-                                <template v-else-if="item.Is_Merge===1&&item.modelShow">
+                                <template v-else-if="item.Is_Merge==1">
                                   <my-HB-Bill :ID="item.FrID" :width="widthSon"  :color="colorSon"></my-HB-Bill>
                                 </template>
-                            <span slot="reference" @click="item.modelShow = true" class="text_d PingFangSC" >{{item.FrID}}</span>
+                                {{item.Type}}__{{item.Is_Merge}}__{{item.Is_Merge==0}}
+                            <span slot="reference" class="text_d PingFangSC" >{{item.FrID}}</span>
                         </el-popover>
                     </td>
                     <td>

src/plug/index.js

@@ -119,9 +119,9 @@ export default {
         let lxymallUrl = ''; //国内游api
         let crmUrl = ""; //crm API
         let locationName = window.location.hostname;
-        domainUrl = "http://192.168.10.128";
+        // domainUrl = "http://192.168.10.128";
         // domainUrl = "http://192.168.10.9:8083" // 刘东电脑
-        // domainUrl = "http://192.168.10.226";
+        domainUrl = "http://192.168.10.226";
         //domainUrl = "http://reborn.oytour.com";
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";