Merge branch 'dev' of http://gogs.ainets.net/mirendemianbaona/nc-admin into dev

src/views/flowPool/components/add.vue

@@ -55,7 +55,7 @@ const state = ref({
     "status": "",
     "simTariffId": null,
     "expireTime": "",
-    "iccids": [],
+    // "iccids": [],
     "size": null,
     "sizeType": ""
   },
@@ -130,7 +130,7 @@ const resetForm = () => {
     "status": "",
     "simTariffId": null,
     "expireTime": "",
-    "iccids": [],
+    // "iccids": [],
     "size": null,
     "sizeType": ""
   }
@@ -144,28 +144,28 @@ const handleDictValue = async () => {
 }
 
 
-const selectChange = (val) => {
-  updateCardList({ id: val }).then(res => {
-    if (res.code === 200) {
-      formState.value.iccids = []
-      card.value = res.data
-    }
-  })
-}
+// const selectChange = (val) => {
+//   updateCardList({ id: val }).then(res => {
+//     if (res.code === 200) {
+//       formState.value.iccids = []
+//       card.value = res.data
+//     }
+//   })
+// }
 
 watch(() => record.value, val => {
   const datas = JSON.parse(JSON.stringify(val))
   if (props.typeCurrent == 2) {
     formState.value = datas
-    formState.value.iccids = []
-    updateCardList({ id: val.simTariffId }).then(res => {
-      if (res.code === 200) {
-        val.iccids.forEach(res => {
-          formState.value.iccids.push(res.iccid)
-        })
-        card.value = res.data
-      }
-    })
+    // formState.value.iccids = []
+    // updateCardList({ id: val.simTariffId }).then(res => {
+    //   if (res.code === 200) {
+    //     val.iccids.forEach(res => {
+    //       formState.value.iccids.push(res.iccid)
+    //     })
+    //     card.value = res.data
+    //   }
+    // })
   }
 }, { deep: true })
 
@@ -177,14 +177,14 @@ watch(() => modelValue.value, val => {
 })
 
 
-const changeAll = (e)=>{
-  SelectAll.value = e
-  if (e) {
-    formState.value.iccids = card.value.map(res => res.iccid)
-  } else {
-    formState.value.iccids = []
-  }
-}
+// const changeAll = (e)=>{
+//   SelectAll.value = e
+//   if (e) {
+//     formState.value.iccids = card.value.map(res => res.iccid)
+//   } else {
+//     formState.value.iccids = []
+//   }
+// }
 
 
 </script>
@@ -227,7 +227,7 @@ const changeAll = (e)=>{
               </a-option>
             </a-select>
           </a-form-item>
-          <a-form-item :label="$t('flowPool.ICCIDlabel')" v-if="formState?.simTariffId !== null">
+          <!-- <a-form-item :label="$t('flowPool.ICCIDlabel')" v-if="formState?.simTariffId !== null">
             <a-select v-model="formState.iccids" multiple :placeholder="$t('flowPool.ICCIDName')" :max-tag-count="10">
               <a-option v-for=" item in card" :key="item.iccid" :value="item.iccid">{{item.iccid}}
               </a-option>
@@ -237,7 +237,7 @@ const changeAll = (e)=>{
                 </div>
               </template>
             </a-select>
-          </a-form-item>
+          </a-form-item> -->
           <a-form-item :label="$t('flowPool.expireTime')" field="expireTime">
             <a-date-picker v-model="formState.expireTime" show-time :time-picker-props="{ defaultValue: '09:09:06' }"
               format="YYYY-MM-DD HH:mm:ss" />

src/views/order/BuyCard/index.vue

@@ -3,7 +3,7 @@
   <div class="silent-expire-alarm">
     <!-- 搜索条件区 -->
     <div class="search-section">
-      <Search :SearchForm="SearchFormBuyOrder" @reset="reset"/>
+      <Search :SearchForm="SearchFormBuyOrder" @query="intData" @reset="reset"/>
     </div>
     <div class="audit-btn" v-if="userType == 2">
       <a-button @click="showAudit = true" type="text">

vite.config.js

@@ -61,10 +61,9 @@ export default defineConfig({
         hmr: true,
         proxy: {
             "/api": {
-                target: "http://sim.nanodreamtech.com",
-                // target:"http://192.168.101.12:3001",// 果本地端口
+                // target: "http://sim.nanodreamtech.com",
                 // target: "http://127.0.0.1:3001",
-                // target: "http://sim.ainets.net",
+                target: "http://sim.ainets.net",
                 changeOrigin: true,
                 ws: true,
                 secure: true,