Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-web

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

               type="textarea"
             />
           </el-form-item>
-          <el-form-item label="解决方案:" prop="solution">
+          <el-form-item label="解决方案:" prop="solution" v-if="typeOption === '下黑'">
             <el-input
                 maxlength="200"
                 v-trim
 const VEHICLE_COLOR_TYPE = computed(() => {
   return $storeinitData.state.dictData['VEHICLE_COLOR_TYPE'] || []
 })
-const DATA_SOURCE = computed(() => {
-  return $storeinitData.state.dictData['DATA_SOURCE'] || []
+const SOURCE_TYPE = computed(() => {
+  return $storeinitData.state.dictData['SOURCE_TYPE'] || []
 })
 
 //或取路由传入过来的对象数据
         type: 'input',
       },
     },
+    {
+      prop: 'agencyId',
+      label: '渠道编号',
+      width: 170,
+      form: {
+        width: '45%',
+        type: 'input',
+      }
+    },
     {
       prop: 'type',
       label: '类型',
       },
     },
     {
-      prop: 'creationTime',
+      prop: 'createTime',
       label: '下黑时间',
       width: '170px',
       funRuleStarts: true,
     },
     {
       label: '下黑来源',
-      prop: 'loginSource',
-      listData: DATA_SOURCE,
+      prop: 'sourceIn',
+      listData: SOURCE_TYPE,
       hide: true,
       form: {
         width: '45%',
         type: 'select',
-        listData: DATA_SOURCE,
+        listData: SOURCE_TYPE,
       },
     },
     {
-      prop: 'createTime',
+      prop: 'releaseTime',
       label: '反白时间',
       width: '170px',
       funRuleStarts: true,
     },
     {
       label: '反白来源',
-      prop: 'loginSourceHis',
-      listData: DATA_SOURCE,
+      prop: 'sourceOut',
+      listData: SOURCE_TYPE,
       hide: true,
       form: {
         width: '45%',
         type: 'select',
-        listData: DATA_SOURCE,
+        listData: SOURCE_TYPE,
       },
     },
   ],
       channelType:2,
       staffId:cacheAccessToken['openId']
     }
+    if(params.status == 2){
+      api = '/managew/api/bls/card/cardOut'
+    }
     console.log(params, 'paramsparams')
     BaseService.post(api, params).then((res: any) => {
       if (res && res.statusCode === 0) {
     (res: any) => {
       if (res && res.statusCode === 0) {
         let bizContent = res.data
-        let data = bizContent.data || []
+        let data = bizContent.results || []
         tableData.value = data
         console.log('===bizContentData', bizContent)
         crudRef.value.tableLoding = false
-        field.value.paging.total = bizContent.totalCount
+        // field.value.paging.total = bizContent.totalCount
       } else {
         crudRef.value.tableLoding = false
         ElMessage.error(res.message)

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

                     <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-form-item label='解决方案:' prop="solution" v-if="typeOption === '下黑'">
                     <el-input maxlength="200" v-trim clearable v-model="addForm.solution" placeholder="请输入解决方案"
                               :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" />
                   </el-form-item>
         return $storeinitData.state.dictData['VEHICLE_COLOR_TYPE'] || []
     })
 
+    const SOURCE_TYPE = computed(() => {
+      return $storeinitData.state.dictData['SOURCE_TYPE'] || []
+    })
+
     //或取路由传入过来的对象数据
     const route = useRoute();
     const dataFormRef = ref()
                 }
             },
             {
-                prop: 'issuerId',
-                label: '发行方编号',
+                prop: 'agencyId',
+                label: '渠道编号',
                 width: 170,
                 form: {
                     width: '45%',
                 }
             },
             {
-                prop: 'creationTime',
+                prop: 'createTime',
                 label: '下黑时间',
                 width: '170px',
                 funRuleStarts: true,
                     type: 'input',
                 }
             },
+            {
+              label: '下黑来源',
+              prop: 'sourceIn',
+              listData: SOURCE_TYPE,
+              hide: true,
+              form: {
+                width: '45%',
+                type: 'select',
+                listData: SOURCE_TYPE,
+              },
+            },
             {
                 prop: 'releaseTime',
                 label: '反白时间',
                     type: 'input',
                 }
             },
+            {
+              label: '反白来源',
+              prop: 'sourceOut',
+              listData: SOURCE_TYPE,
+              hide: true,
+              form: {
+                width: '45%',
+                type: 'select',
+                listData: SOURCE_TYPE,
+              },
+            },
         ],
     })
     // 搜索按钮
             let params = {
                 ...addForm.value
             }
+          if(params.status == 2){
+            api = '/managew/api/bls/obu/obuOut'
+          }
             BaseService.post(api, params).then((res: any) => {
                 if (res && res.statusCode === 0) {
                     let bizContent = res.data
         BaseService.post('/managew/api/bls/obu/query', params).then((res: any) => {
             if (res && res.statusCode === 0) {
                 let bizContent = res.data
-                let data = bizContent.blackObuHisList || [];
+                let data = bizContent.results || [];
                 console.log("===bizContentData", data)
                 tableData.value = data;
                 crudRef.value.tableLoding = false;