调整发行产品以及知识库相关

src/views/onlineBusinessHall/onlineOperation/feedBackPage/crudConfig.ts

@@ -58,7 +58,7 @@ export default function crudConfig() {
       isToLead: false,
     },
     tableSize: -1,
-    operateShow: true, //是否为表格添加操作栏(默认true)
+    operateShow: false, //是否为表格添加操作栏(默认true)
     operateTitle: '操作', //操作栏标题(默认为"")
     operateFixed: false, //操作栏是否固定(默认false)
     operateWidth: '200', //操作栏宽度

src/views/onlineBusinessHall/onlineOperation/feedBackStatistics/index.vue

@@ -146,7 +146,12 @@ function getBusinessType() {
       if (res && res.code === 0) {
         //数据转换
         let bizContent = res.data
-        businessTypeList.value = bizContent
+        businessTypeList.value = bizContent.map((item) => {
+          return {
+            label: item,
+            value: item,
+          }
+        })
         console.log(bizContent, 'bizContent')
       } else {
         crudRef.value.tableLoding = false

src/views/onlineBusinessHall/onlineOperation/feedBacklog/crudConfig.ts

@@ -3,6 +3,25 @@ import { ref } from 'vue'
 export default function crudConfig() {
   //获取所有业务类型
   const businessTypeList = ref([])
+  const operationTypeList = ref([
+    {
+      label: '新增',
+      value: 'ADD',
+    },
+    {
+      label: '删除',
+      value: 'DELETE',
+    },
+    {
+      label: '更改',
+      value: 'UPDATE',
+    },
+    {
+      label: '查询',
+      value: 'QUERY',
+    },
+  ])
+
   const field = ref({
     tabSize: 'small', //Table 的尺寸 large / default /small (默认default)
     searchShow: true, //是否显示搜索模块(默认false)
@@ -38,7 +57,7 @@ export default function crudConfig() {
       isToLead: false,
     },
     tableSize: -1,
-    operateShow: true, //是否为表格添加操作栏(默认true)
+    operateShow: false, //是否为表格添加操作栏(默认true)
     operateTitle: '操作', //操作栏标题(默认为"")
     operateFixed: false, //操作栏是否固定(默认false)
     operateWidth: '200', //操作栏宽度
@@ -63,11 +82,11 @@ export default function crudConfig() {
     ],
     field: [
       {
-        prop: 'processName',
+        prop: 'staffId',
         label: '员工编号',
       },
       {
-        prop: 'name',
+        prop: 'staffName',
         label: '员工姓名',
       },
       {
@@ -80,11 +99,12 @@ export default function crudConfig() {
         label: '类别',
       },
       {
-        prop: 'solution',
+        prop: 'operationType',
         label: '操作',
+        listData:operationTypeList
       },
       {
-        prop: 'time',
+        prop: 'insertTime',
         label: '时间',
       },
     ],

src/views/onlineBusinessHall/onlineOperation/feedBacklog/index.vue

@@ -145,7 +145,12 @@ function getBusinessType() {
       if (res && res.code === 0) {
         //数据转换
         let bizContent = res.data
-        businessTypeList.value = bizContent
+        businessTypeList.value = bizContent.map((item) => {
+          return {
+            label: item,
+            value: item,
+          }
+        })
         console.log(bizContent, 'bizContent')
       } else {
         crudRef.value.tableLoding = false

src/views/onlineBusinessHall/orderManagement/index.vue

@@ -1212,6 +1212,7 @@
       }
     })
   }
+  
   // 发货导出
   function download() {
     exportFn('/managew/api/order/deliverGoodsExport', getParams(), '发货信息')

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

@@ -543,7 +543,6 @@ const getFeeListData = (releaseId, form) => {
         })
       }
 
-
       afterSaleFeesList.value = data.afterSaleFees
 
       console.log(feeListData.value, releaseList.value, 'getFeeListData')
@@ -632,7 +631,7 @@ function getmerchantList() {
         return {
           label: item.appName,
           value: item.id,
-          merchantId:item.merchantId,
+          merchantId: item.merchantId,
         }
       })
       console.log(bizContent, 'getmerchantList')
@@ -653,6 +652,7 @@ function getmerchantListTx() {
         return {
           label: item.channelName,
           value: item.channelId,
+          merchantId: item.merchantId,
         }
       })
 
@@ -1016,6 +1016,8 @@ let field = ref({
         type: 'select',
         listData: merchantListTx,
         required: true,
+        isShowValue: true,
+        isShowProp: 'merchantId',
       },
     },
     {
@@ -1087,8 +1089,8 @@ let field = ref({
         type: 'select',
         listData: merchantList,
         required: true,
-        // isShowValue: true,
-        // isShowProp:"value"
+        isShowValue: true,
+        isShowProp: 'merchantId',
       },
     },
 
@@ -1185,6 +1187,8 @@ let field = ref({
         formLabelWidth: formLabelWidth,
         type: 'select',
         required: true,
+        isShowValue: true,
+        isShowProp: 'merchantId',
       },
     },
 

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

@@ -1128,6 +1128,7 @@ function submit(data: any) {
         }
       })
       datas.isPay = datas.isPay ? parseInt(datas.isPay) : ''
+      datas.qtSign = datas.qtSign ? parseInt(datas.qtSign) : ''
       // console.log('请请i参数', datas)
       BaseService.postN(api, datas).then((res: any) => {
         if (res && res.code === 0) {
@@ -1994,6 +1995,18 @@ let field = ref<any>({
         listData: isPayOptions,
       },
     },
+    {
+      prop: 'qtSign',
+      label: '是否黔通签约',
+      listData: isPayOptions,
+      form: {
+        width: '45%',
+        formLabelWidth: formLabelWidth,
+        type: 'select',
+        required: true,
+        listData: isPayOptions,
+      },
+    },
     {
       prop: 'customerType',
       label: '支持车辆所属性质', //用户类型

src/views/system/branch/index.vue

@@ -21,7 +21,7 @@
         </el-button>
       </template>
       <template #dialog>
-        <el-form label-position="right" label-width="110px" :model="addForm" :rules="rules"
+        <el-form label-position="right" label-width="150px" :model="addForm" :rules="rules"
           :ref="(el) => (dataFormRef = el)" :hide-required-asterisk="typeOption === 'view'" v-loading="formLoding">
           <el-form-item v-if="!isFirstDot" label="上级网点编号:" prop="superServiceHallId">
             <div style="width: 100%">
@@ -60,9 +60,9 @@
               <el-input maxlength="60" v-trim clearable v-model="addForm.latitude" placeholder="请输入纬度" />
             </div>
           </el-form-item>
-          <el-form-item label="半径距离:" prop="radial">
+          <el-form-item label="半径距离(单位:米):" prop="radial">
             <div style="width: 100%">
-              <el-input maxlength="60" v-trim clearable v-model="addForm.radial" placeholder="请输入半径距离" />
+              <el-input maxlength="60" v-trim clearable v-model="addForm.radial" placeholder="请输入半径距离(单位:米)" />
             </div>
           </el-form-item>
 

vite.config.ts

@@ -64,8 +64,6 @@ export default defineConfig(({ command, mode }) => {
     server: {
       host: '0.0.0.0',
       port: 8085,
-      hmr: true,
-
       open: true, // 类型： boolean | string在服务器启动时自动在浏览器中打开应用程序；
       cors: true, // 类型： boolean | CorsOptions 为开发服务器配置 CORS。默认启用并允许任何源
       proxy: {