修改卡查询、签查询的

src/views/onlineBusinessHall/informationManagement/cardInfo/index.vue

@@ -30,7 +30,7 @@
             :label="item.label"
             :key="item.label"
             :value="item.value"
-            v-for="item in CARD_STATE_TYPE"
+            v-for="item in CARD_STATUS"
           />
         </el-select>
         <el-input
@@ -102,8 +102,8 @@ const VEHICLE_COLOR_TYPE = computed(() => {
 })
 
 // 卡状态
-const CARD_STATE_TYPE = computed(() => {
-  return $storeinitData.state.dictData['CARD_STATE_TYPE'] || []
+const CARD_STATUS = computed(() => {
+  return $storeinitData.state.dictData['CARD_STATUS'] || []
 })
 
 const CARD_TYPE = computed(() => {
@@ -133,6 +133,7 @@ const VEHICLE_CONTRACT_TYPE = computed(() => {
 const DEVICE_VERSION = computed(() => {
   return $storeinitData.state.dictData['DEVICE_VERSION'] || []
 })
+const agencyIdList = ref([])
 
 const crudRef = ref()
 const itemStart = ref(true)
@@ -163,7 +164,20 @@ function refreshLeft() {
   }
   getList()
 }
-
+function getAgenCy() {
+  BaseService.post('/userw/agency/agencyqueryall', {}).then((res: any) => {
+    if (res && res.statusCode === 0) {
+      //数据转换 .agencyQueryAllModels
+      let bizContent = res.data
+      agencyIdList.value = bizContent.map((item) => {
+        return {label: item.name, value: item.agencyId}
+      })
+      // console.log(agencyIdList.value, 'agencyIdList.value')
+    } else {
+      ElMessage.error(res.message)
+    }
+  })
+}
 function getList() {
   crudRef.value.tableLoding = true
   let params: any = {
@@ -1289,8 +1303,8 @@ const field = ref<any>({
     },
     {
       label: '渠道名称',
-      prop: 'agencyName',
-      form,
+      prop: 'agencyId',
+      listData: agencyIdList
     },
     {
       prop: 'vehiclePlate',
@@ -1310,36 +1324,12 @@ const field = ref<any>({
     {
       label: '卡状态',
       prop: 'cardStatus',
-      funRuleStarts: true,
-      funRule: (val) => {
-        return getDictLabel(CARD_STATE_TYPE, val)
-      },
-      form: {
-        formLabelWidth,
-        width: '45%',
-        type: 'input',
-        funRuleStarts: true,
-        funRule: (val) => {
-          return getDictLabel(CARD_STATE_TYPE, val)
-        },
-      },
+      listData: CARD_STATUS,
     },
     {
       label: '卡类型',
-      prop: 'cardType',
-      funRuleStarts: true,
-      funRule: (val) => {
-        return getDictLabel(CARD_TYPE, val)
-      },
-      form: {
-        formLabelWidth,
-        width: '45%',
-        type: 'input',
-        funRuleStarts: true,
-        funRule: (val) => {
-          return getDictLabel(CARD_TYPE, val)
-        },
-      },
+      prop: 'cardTypeNew',
+      listData: CARD_TYPE
     },
     {
       label: '卡品牌',
@@ -1434,6 +1424,7 @@ const field = ref<any>({
 
 onMounted(() => {
   getList()
+  getAgenCy()
 })
 </script>
 <style scoped>

src/views/onlineBusinessHall/informationManagement/obuInfo/index.vue

@@ -30,7 +30,7 @@
             :label="item.label"
             :key="item.label"
             :value="item.value"
-            v-for="item in OBU_STATE_TYPE"
+            v-for="item in OBU_STATUS"
           />
         </el-select>
         <el-input
@@ -120,8 +120,8 @@ const VEHICLE_COLOR_TYPE = computed(() => {
 })
 
 // obu状态
-const OBU_STATE_TYPE = computed(() => {
-  return $storeinitData.state.dictData['OBU_STATE_TYPE'] || []
+const OBU_STATUS = computed(() => {
+  return $storeinitData.state.dictData['OBU_STATUS'] || []
 })
 
 const VEHICLE_MODEL_TYPE = computed(() => {
@@ -148,6 +148,8 @@ const VEHICLE_CONTRACT_TYPE = computed(() => {
 const DEVICE_VERSION = computed(() => {
   return $storeinitData.state.dictData['DEVICE_VERSION'] || []
 })
+const agencyIdList = ref([])
+
 const crudRef = ref()
 const itemStart = ref(true)
 const searchForm = ref({
@@ -177,7 +179,20 @@ function refreshLeft() {
   }
   getList()
 }
-
+function getAgenCy() {
+  BaseService.post('/userw/agency/agencyqueryall', {}).then((res: any) => {
+    if (res && res.statusCode === 0) {
+      //数据转换 .agencyQueryAllModels
+      let bizContent = res.data
+      agencyIdList.value = bizContent.map((item) => {
+        return {label: item.name, value: item.agencyId}
+      })
+      // console.log(agencyIdList.value, 'agencyIdList.value')
+    } else {
+      ElMessage.error(res.message)
+    }
+  })
+}
 function getList() {
   crudRef.value.tableLoding = true
   let params: any = {
@@ -1308,8 +1323,8 @@ const field = ref({
     },
     {
       label: '渠道名称',
-      prop: 'agencyName',
-      form,
+      prop: 'agencyId',
+      listData: agencyIdList
     },
     {
       prop: 'vehiclePlate',
@@ -1329,19 +1344,7 @@ const field = ref({
     {
       label: 'obu状态',
       prop: 'obuStatus',
-      funRuleStarts: true,
-      funRule: (val) => {
-        return getDictLabel(OBU_STATE_TYPE, val)
-      },
-      form: {
-        formLabelWidth,
-        width: '45%',
-        type: 'input',
-        funRuleStarts: true,
-        funRule: (val) => {
-          return getDictLabel(OBU_STATE_TYPE, val)
-        },
-      },
+      listData: OBU_STATUS
     },
     {
       label: 'obu品牌',
@@ -1436,6 +1439,7 @@ const field = ref({
 
 onMounted(() => {
   getList()
+  getAgenCy()
 })
 </script>
 <style scoped>

src/views/onlineBusinessHall/productManagement/equityProduct/index.vue

@@ -6,7 +6,7 @@
       @customSelectorSelection="customSelectorSelection" @handleInfo="handleInfo" @submit="submit"
       @handleEdit="handleEdit">
       <template #search>
-        <el-input v-trim clearable v-model="searchForm.productName" style="width: 200px" placeholder="请输入权益名称" />
+        <el-input v-trim clearable v-model="searchForm.equityName" style="width: 200px" placeholder="请输入权益名称" />
         <el-select clearable v-model="searchForm.status" style="width: 200px" placeholder="请选择启用状态">
           <el-option v-for="item in ENABLE_DISABLE_STATUS" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
@@ -138,7 +138,7 @@ const check = ref(false)
 let autdis: any = ref({ examine: '0' }) //审核对象
 //查询参数
 const searchForm = ref({
-  productName: '', //标准名称
+  equityName: '', //标准名称
   status: '', //启用状态
 })
 let tableData: any = ref([])
@@ -429,7 +429,7 @@ function handleCurrentChange(val: any) {
 // 搜索重置
 function refreshLeft() {
   searchForm.value = {
-    productName: '', //标准名称
+    equityName: '', //权益名称
     status: '', //启用状态
   }
   field.value.paging.currentPage = 1
@@ -567,26 +567,6 @@ let field = ref({
     },
   ],
   field: [
-    // {
-    //   prop: 'singleEquityId',
-    //   label: '单项权益编号',
-    //   form: {
-    //     width: '90%',
-    //     formLabelWidth: formLabelWidth,
-    //     type: 'input',
-    //     required: true,
-    //   },
-    // },
-    // {
-    //   prop: 'productName',
-    //   label: '权益类产品名称',
-    //   form: {
-    //     width: '45%',
-    //     formLabelWidth: formLabelWidth,
-    //     type: 'input',
-    //     required: true,
-    //   },
-    // },
     {
       prop: 'equityName',
       label: '权益名称',
@@ -650,33 +630,6 @@ let field = ref({
         required: true,
       },
     },
-    // {
-    //   prop: 'cardType',
-    //   label: '卡种',
-    //   listData: CLAMP_TYPE,
-    //   form: {
-    //     width: '45%',
-    //     multiple: true,
-    //     formLabelWidth: formLabelWidth,
-    //     type: 'select',
-    //     required: true,
-    //     listData: CLAMP_TYPE,
-    //   },
-    // },
-    // {
-    //   prop: 'carType',
-    //   label: '车型',
-    //   listData: VEHICLE_MODEL_TYPE,
-    //   form: {
-    //     valueKey: 'value',
-    //     width: '45%',
-    //     formLabelWidth: formLabelWidth,
-    //     type: 'select',
-    //     multiple: true,
-    //     required: true,
-    //     listData: VEHICLE_MODEL_TYPE,
-    //   },
-    // },
     {
       prop: 'chargeType',
       label: '收费类型',