Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/QXPDA
# Conflicts:
# Mst.master
| | |
| | | }, |
| | | removeXJ() { |
| | | |
| | | var that = this; |
| | | |
| | | that.ttrre = true; |
| | | |
| | | that.AxiosHttp("post", 'MesQaItemsDetect01Manager/ReloadModel5', { |
| | | guid: "158f4324-955e-4a3b-aafa-09babf3c3368" |
| | | }, true, 1).then(function (res1) { |
| | | if (res1.status == 1) { |
| | | that.$toast.fail(res1.message); |
| | | } else { |
| | | that.$notify({ type: 'success', message: '提交成功' }); |
| | | that.init(); |
| | | } |
| | | that.ttrre = false |
| | | }).catch(function (error) { |
| | | that.$toast.fail("网络错误,请重试!"); |
| | | that.ttrre = false |
| | | console.log(error); |
| | | }); |
| | | |
| | | }, |
| | | GetBack1() { |
| | | window.history.back(); |
| | |
| | | </van-cell-group> |
| | | </div> |
| | | <van-button :loading="ttrre" type="info" loading-text="加载中..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">检验提交</van-button> |
| | | <%-- <van-button type="danger" v-if="!formData.fcheckResu && !isShowTable" @click="removeXJ">删除单据</van-button>--%> |
| | | <van-button type="danger" v-if="!formData.fcheckResu && !isShowTable" @click="removeXJ">重新加载项目</van-button> |
| | | <van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;"> |
| | | <van-tab title="检验项目" class="mySolid font"> |
| | | <van-row type="flex" justify="center"> |
| | |
| | | <comback ></comback> |
| | | </asp:Content> |
| | | <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server"> |
| | | <script src="../Js/LLJ/Add.js?<%=1124 %>"></script> |
| | | <script src="../Js/LLJ/Add.js?<%=1124321 %>"></script> |
| | | </asp:Content> |
| | |
| | | <script src="/Scripts/vue.min.js"></script> |
| | | <script src="/Scripts/js.cookie.min.js"></script> |
| | | <script src="/scripts/axios0.25.0.js"></script> |
| | | <<<<<<< HEAD |
| | | <script src="/scripts/config.js?<%=3455 %>"></script> |
| | | ======= |
| | | <script src="/scripts/config.js?<%=3475 %>"></script> |
| | | >>>>>>> 033ef98f861148ffbff692a39ad0825f1e320326 |
| | | <link href="/scripts/vant/vant.css" rel="stylesheet" /> |
| | | <script src="/scripts/vant/vant.js"></script> |
| | | <link href="/Images/Style.css?<%=1 %>" rel="stylesheet" /> |
| | |
| | | * @param:{string} params 请求参数,非必填 |
| | | * @param:{string} variation 请求头,非必填 |
| | | **/ |
| | | Vue.prototype.AxiosHttp = (method, url, params = {}, isToken = true) => { |
| | | url = (APIURL + url); |
| | | Vue.prototype.AxiosHttp = (method, url, params = {}, isToken = true, isPC =0) => { |
| | | if (isPC == 0) |
| | | { |
| | | url = (APIURL + url); |
| | | } |
| | | else{ |
| | | url = (APIURL_PC + url); |
| | | } |
| | | let headers = { 'Content-Type': 'application/json', } |
| | | if (isToken) { |
| | | var timestamp = (new Date()).getTime(); |
| | | var token = "BasicAuth " + timestamp + "_" + Cookies.get('loginGuid'); |
| | | /*var token = "BasicAuth " + timestamp + "_" + Cookies.get('loginGuid');*/ |
| | | var token = "token " + "aa649c62-a6ec-4b75-a97d-b0966485104c~969adcd4-457f-43db-9faf-5fb03ed95765"; |
| | | headers['Authorization'] = token; |
| | | } |
| | | if (method == 'get') { |