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

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

@@ -15,14 +15,27 @@
       @download="downloadHandle"
     >
       <template #search>
-        <el-input
-          maxlength="60"
-          v-trim
-          clearable
-          v-model="searchForm.cardId"
-          style="width: 200px"
-          placeholder="请输入卡号"
-        />
+        <el-form
+            :model="searchForm"
+            :rules="rules"
+            :ref="(el) => (searchFormRef = el)"
+            v-loading="formLoding"
+        >
+          <el-form-item
+              label="卡号:"
+              prop="cardId"
+          >
+            <el-input
+                maxlength="60"
+                v-trim
+                clearable
+                v-model="searchForm.cardId"
+                style="width: 200px"
+                placeholder="请输入卡号"
+            />
+          </el-form-item>
+        </el-form>
+
         <el-input
           maxlength="60"
           v-trim
@@ -110,6 +123,17 @@
               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 }">
@@ -160,6 +184,7 @@ const DATA_SOURCE = computed(() => {
 //或取路由传入过来的对象数据
 const route = useRoute()
 const dataFormRef = ref()
+const searchFormRef = ref()
 const crudRef = ref()
 const itemStart = ref(true)
 const searchForm = ref({
@@ -180,12 +205,13 @@ const addForm: any = ref({
 const formLoding = ref(false)
 const rules = {
   reason: [{ required: true, message: '请输入原因', trigger: 'blur' }],
+  solution: [{ required: true, message: '请输入解决方案', trigger: 'blur' }],
   type: [{ required: true, message: '请选择类型', trigger: 'change' }],
   cardId: [{ required: true, message: '请输入卡号', trigger: 'blur' }],
 }
 const tableData = ref([] as any[])
 const typeList = computed(() => {
-  return $storeinitData.state.dictData['BLACKLIST_TYPE'] || []
+  return $storeinitData.state.dictData['CARD_BLACK_TYPE'] || []
 })
 //表单数据配置
 const field = ref({
@@ -426,8 +452,13 @@ const field = ref({
 })
 // 搜索按钮
 function btnSearch() {
-  field.value.paging.currentPage = 1
-  getList()
+  searchFormRef.value.validate((valid: boolean) => {
+    if (!valid) {
+      return false
+    }
+    field.value.paging.currentPage = 1
+    getList()
+  });
 }
 // 搜索重置
 function refreshLeft() {
@@ -472,7 +503,7 @@ function submitClick() {
     if (!valid) {
       return false
     }
-    let api = '/managew/obublack/cardblacklistuploadsubmit'
+    let api = '/managew/api/bls/card/cardIn'
     let params = {
       ...addForm.value,
       channelType:2,
@@ -514,7 +545,7 @@ function getList() {
       params[key] = searchFormList[key]
     }
   }
-  BaseService.post('/iaw/app/issue/cardBlack/query', params).then(
+  BaseService.post('/managew/api/bls/card/query', params).then(
     (res: any) => {
       if (res && res.statusCode === 0) {
         let bizContent = res.data

src/views/onlineBusinessHall/equityManagement/singleEquityManagement/index.vue

@@ -612,11 +612,11 @@ let field = ref<any>({
       listData: agencyIdList,
       form: {
         width: '45%',
-        multiple: true,
         formLabelWidth: formLabelWidth,
         listData: agencyIdList,
         type: 'select',
         required: true,
+        multiple: true,
       },
     },
 

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

@@ -27,6 +27,11 @@
           </el-button>
         </div>
       </template>
+      <template #releaseIdSlot>
+        <el-select clearable v-model="crudRef.form.releaseId" style="width: 200px" placeholder="选择发行产品" :disabled="typeOption == 'edit'">
+          <el-option v-for="item in releaseIdIdList" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </template>
       <template #feeListSlot>
         <FeeList v-model="feeListData" :isType="isFeeListType" :isInfo="isInfo" :agencyqueryallList="PAY_TYPE"
           :merchantList="merchantList" ref="feeListRef" />
@@ -665,7 +670,7 @@ const getFeeListData = (releaseId, form) => {
 
 const getEditFeeListData = (id, form) => {
   BaseService.postN('/managew/api/product/promotion/detail', {
-    id,
+    id: form.id,
   }).then((res: any) => {
     if (res && res.statusCode === 0) {
       //数据转换
@@ -761,7 +766,7 @@ function getReleaseIdIdList() {
 const selectAll = ref([])
 function getReaseList() {
   BaseService.post(
-    '/managew/api/product/releaseProductStandards/allList',
+    '/managew/api/product/promotion/allProductKv',
     {}
   ).then((res: any) => {
     if (res && res.statusCode === 0) {
@@ -913,20 +918,28 @@ let field = ref({
     },
   ],
   field: [
+    
+    {
+      prop: 'id',
+      hide: true
+    },
+    {
+      prop: 'productName',
+      label: '发行产品',
+      span: 3,
+    },
     {
       prop: 'releaseId',
       label: '发行产品',
-      listData: selectAll,
       span: 3,
       form: {
         width: '45%',
         formLabelWidth: formLabelWidth,
-        type: 'select',
-        listData: ReleaseIdIdList,
-        required: true,
+        slotSetEdit: true, // 是否启用编辑插槽
+        slotSetNameEdit: 'releaseIdSlot', // 编辑插槽名
+        listData: selectAll
       },
     },
-
     {
       hide: true,
       label: '推广合同',

src/views/system/agency/index.vue

@@ -58,8 +58,8 @@
                             <template v-slot="scope">
                                 <div class="input-wrap">
                                     <el-form-item prop="termOfValidity">
-                                        <el-input maxlength="60" v-trim clearable v-model="scope.row.termOfValidity"
-                                            placeholder="有效期"></el-input>
+                                        <el-date-picker maxlength="60" v-trim clearable v-model="scope.row.termOfValidity"
+                                            placeholder="有效期"  value-format="YYYY-MM-DD"></el-date-picker>
                                     </el-form-item>
                                 </div>
                             </template>