bug修复

.env.development

@@ -30,7 +30,7 @@ VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' #线上地址 prod
 VITE_APP_EXPORT_URL = "http://162.14.97.68:11111/"
 VITE_APP_EXPORT_URL_NEW = "https://qtzl.etcjz.cn/"
 # VITE_APP_UPLOAD_URL = 'https://qtzl.etcjz.cn/' #试运行环境
-VITE_APP_UPLOAD_URL = 'http://qtzl.etcjz.cn/newDev/' #试运行环境
+VITE_APP_UPLOAD_URL = 'http://qtzl.etcjz.cn/' #试运行环境
 # VITE_APP_UPLOAD_URL = "http://192.168.100.158:8085/"
 # VITE_APP_UPLOAD_URL = "http://192.168.100.63:50001/" #测试环境地址
 # VITE_APP_UPLOAD_URL = "https://trial.etcjz.cn/" #生成环境地址

src/views/onlineBusinessHall/automobileSeroice/cardBlacklistManagement/index.vue

@@ -11,6 +11,7 @@
       :tableData="tableData"
       @handleEdit="handleEdit"
       @cancel="cancel"
+      @importData="importData"
       @CurrentChange="handleCurrentChange"
       @download="downloadHandle"
     >
@@ -243,6 +244,12 @@ const field = ref({
     isDownload: false,
     isAdd: false,
     isTransferMachine: false,
+    isToLead: true, // 导入
+    isTemplate: true,
+    templateUrl:
+        import.meta.env.VITE_APP_UPLOAD_URL +
+        'zhywpt-issuer/template/managew/卡批量下黑反白模板.xlsx',
+    templateFileName: '卡批量下黑反白模板',
   },
   tableSize: -1,
   operateShow: true, //是否为表格添加操作栏(默认true)
@@ -493,6 +500,24 @@ function cancel() {
   crudRef.value.title = ''
   typeOption.value = ''
 }
+
+function importData(url) {
+  BaseService.postN('/managew/api/bls/card/cardImport', { excelUrl: url }).then((res: any) => {
+    if (res && res.code === 0) {
+      console.log(res)
+      const errUrl = res.data?.path ?? ''
+      if (errUrl) {
+        ElMessage.error("导入失败，请查看下载到本地文件的具体错误信息");
+        BaseService.getDownload(
+            import.meta.env.VITE_APP_UPLOAD_URL + errUrl,
+            '错误信息文件'
+        )
+      } else {
+        ElMessage.success("导入成功");
+      }
+    }
+  });
+}
 function handleCurrentChange(val: number) {
   field.value.paging.currentPage = val
   getList()

src/views/onlineBusinessHall/automobileSeroice/signBlacklistManagement/index.vue

@@ -4,9 +4,26 @@
             @btnSearch="btnSearch" @refreshLeft="refreshLeft" :initData="initItem" :tableData="tableData"
             @handleEdit="handleEdit" @cancel="cancel" @CurrentChange="handleCurrentChange">
             <template #search>
-
-                <el-input maxlength="60" v-trim clearable v-model="searchForm.obuId" style="width: 200px;"
-                    placeholder="请输入签号" />
+              <el-form
+                  :model="searchForm"
+                  :rules="rules"
+                  :ref="(el) => (searchFormRef = el)"
+                  v-loading="formLoding"
+              >
+                <el-form-item
+                  label="签号:"
+                  prop="obuId"
+              >
+                <el-input
+                    maxlength="60"
+                    v-trim
+                    clearable
+                    v-model="searchForm.obuId"
+                    style="width: 200px"
+                    placeholder="请输入签号"
+                />
+              </el-form-item>
+              </el-form>
                 <el-input maxlength="60" v-trim clearable v-model="searchForm.vehiclePlate" placeholder="请输入车牌号"
                     style="width: 320px;">
                     <template #append>
@@ -34,10 +51,15 @@
                                 :value="item.value" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label='原因:' prop="reason">
-                        <el-input maxlength="200" v-trim clearable v-model="addForm.reason" placeholder="请输入原因"
-                            :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
-                    </el-form-item>
+                  <el-form-item label='原因:' prop="reason">
+                    <el-input maxlength="200" v-trim clearable v-model="addForm.reason" placeholder="请输入原因"
+                              :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
+                  </el-form-item>
+                  <el-form-item label='解决方案:' prop="solution">
+                    <el-input maxlength="200" v-trim clearable v-model="addForm.solution" placeholder="请输入解决方案"
+                              :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
+                  </el-form-item>
+
                 </el-form>
             </template>
             <template #operation="{ scope }">
@@ -73,6 +95,7 @@
     //或取路由传入过来的对象数据
     const route = useRoute();
     const dataFormRef = ref()
+    const searchFormRef = ref()
     const crudRef = ref()
     const itemStart = ref(true)
     const searchForm = ref({
@@ -93,12 +116,13 @@
     const formLoding = ref(false);
     const rules = {
         reason: [{ required: true, message: "请输入原因", trigger: "blur" }],
-        type: [{ required: true, message: "请选择类型", trigger: "change" }],
+      solution: [{ required: true, message: '请输入解决方案', trigger: 'blur' }],
+      type: [{ required: true, message: "请选择类型", trigger: "change" }],
         obuId: [{ required: true, message: "请输入签号", trigger: "blur" }],
     }
     const tableData = ref([] as any[]);
     const typeList = computed(() => {
-        return $storeinitData.state.dictData['OBU_BLACKLIST_TYPE'] || []
+      return $storeinitData.state.dictData['OBU_BLACK_TYPE'] || []
     })
     //表单数据配置
     const field = ref({
@@ -129,7 +153,13 @@
         searchOperation: {
             isDownload: false,
             isAdd: false,
-            isTransferMachine: false
+            isTransferMachine: false,
+            isToLead: true, // 导入
+            isTemplate: true,
+            templateUrl:
+                import.meta.env.VITE_APP_UPLOAD_URL +
+                'zhywpt-issuer/template/managew/签批量下黑反白模板.xlsx',
+            templateFileName: '签批量下黑反白模板',
         },
         tableSize: -1,
         operateShow: true, //是否为表格添加操作栏(默认true)
@@ -323,8 +353,13 @@
     })
     // 搜索按钮
     function btnSearch() {
+      searchFormRef.value.validate((valid: boolean) => {
+        if (!valid) {
+          return false
+        }
         field.value.paging.currentPage = 1;
         getList();
+      });
     }
     // 搜索重置
     function refreshLeft() {
@@ -411,7 +446,7 @@
                 params[key] = searchFormList[key]
             }
         }
-        BaseService.post('/managew/obublack/obuqueryblack', params).then((res: any) => {
+        BaseService.post('/managew/api/bls/obu/query', params).then((res: any) => {
             if (res && res.statusCode === 0) {
                 let bizContent = res.data
                 let data = bizContent.blackObuHisList || [];