From 82a97f6ae7894f02d11877b10310698db66c89c1 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期六, 08 六月 2024 17:39:29 +0800 Subject: [PATCH] 实现电缆配置 --- /dev/null | 0 src/components/do/b1-ins-order/add.vue | 17 ++++++++++++----- index.html | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 6989e3f..8ffe751 100644 --- a/index.html +++ b/index.html @@ -21,7 +21,7 @@ </head> <body> <div id="app"></div> - <script type='text/javascript' src='http://192.168.11.200:81/web-apps/apps/api/documents/api.js'></script> + <!-- <script type='text/javascript' src='http://192.168.11.200:81/web-apps/apps/api/documents/api.js'></script> --> <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script> <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script> </body> diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue index 64dbde7..5598379 100644 --- a/src/components/do/b1-ins-order/add.vue +++ b/src/components/do/b1-ins-order/add.vue @@ -117,7 +117,7 @@ <span style="color: #3A7BFA;">淇濆瓨妯℃澘</span> </el-button> <el-button size="medium" type="primary" @click="openEquipConfig" - v-if="PROJECT==='瑁呭鐢电紗' && active==1">鐢电紗閰嶇疆</el-button> + v-if="active==1">瀛愭牱鍝侀厤缃�</el-button> <el-button size="medium" type="primary" @click="openConfig" v-if="addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button> <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button> @@ -509,6 +509,15 @@ </el-radio-group> </div> </el-col> + <el-col class="search_thing" :span="22"> + <div class="search_label">鍗曚环锛�</div> + <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''"> + <el-radio-group v-model="bsm1Val" @input="upBsm1"> + <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" + :label="a">{{JSON.parse(bsmRow.price)[ai]}}</el-radio> + </el-radio-group> + </div> + </el-col> </el-row> <el-row v-if="bsm2"> <el-col class="search_thing" :span="22"> @@ -895,6 +904,7 @@ } this.saveLoad = true this.$axios.post(this.$api.insOrder.addInsOrder, { + str: JSON.stringify({ insOrder: this.addObj, list: JSON.stringify(sampleList.map(a => { a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : ( @@ -902,10 +912,7 @@ return a })), pairing: JSON.stringify(this.bsm2Val2) - }, { - headers: { - 'Content-Type': 'application/json' - } + }) }).then(res => { this.saveLoad = false if (res.code == 201) return diff --git "a/static/\346\243\200\346\265\213\346\212\245\345\221\212\346\250\241\346\235\2772020-11-09.docx" "b/static/\346\243\200\346\265\213\346\212\245\345\221\212\346\250\241\346\235\2772020-11-09.docx" deleted file mode 100644 index 69b627d..0000000 --- "a/static/\346\243\200\346\265\213\346\212\245\345\221\212\346\250\241\346\235\2772020-11-09.docx" +++ /dev/null Binary files differ -- Gitblit v1.9.3