Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

oem/qdhs/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "青岛海商",
   "version": "1.0.8",
   "versionCode": "100008",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://47.104.103.190:8280/cfg?key=qdsp_sp",
   "tradeChannel": "ws",
   "modules": [
     "delivery"

public/config/router.json

@@ -694,7 +694,7 @@
             {
                 "authType": 1,
                 "sort": 5,
-                "title": "出入金申请",
+                "title": "出入金申请记录",
                 "code": "query_inoutapply",
                 "url": "inoutapply",
                 "urlType": 1,

src/packages/pc/views/footer/performance/buy/index.vue

@@ -25,7 +25,7 @@
                     @click="showComponent('manual', row)">手动确认</el-button>
                 <el-button type="warning" size="small" v-if="row.buyorsell === row.executeside - 1"
                     @click="showComponent('delay', row)">延期</el-button>
-                <el-button type="primary" size="small" v-if="![6, 7].includes(row.performancestatus)"
+                <el-button type="danger" size="small" v-if="![6, 7].includes(row.performancestatus)"
                     @click="showComponent('contracted', row)">违约</el-button>
                 <el-button type="info" v-if="![6, 7].includes(row.performancestatus)" size="small"
                     @click="showComponent('edit', row)">修改</el-button>

src/packages/pc/views/footer/performance/sell/index.vue

@@ -25,7 +25,7 @@
                     @click="showComponent('manual', row)">手动确认</el-button>
                 <el-button type="warning" size="small" v-if="row.buyorsell === row.executeside - 1"
                     @click="showComponent('delay', row)">延期</el-button>
-                <el-button type="primary" size="small" v-if="![6, 7].includes(row.performancestatus)"
+                <el-button type="danger" size="small" v-if="![6, 7].includes(row.performancestatus)"
                     @click="showComponent('contracted', row)">违约</el-button>
                 <el-button type="info" v-if="![6, 7].includes(row.performancestatus)" size="small"
                     @click="showComponent('edit', row)">修改</el-button>

src/packages/pc/views/query/inoutapply/history/index.vue

@@ -45,7 +45,7 @@ filterOptons.buttonList = [
 filterOptons.selectList = [
     {
         key: 'querytype',
-        selectedValue: 1,
+        selectedValue: 2,
         options: [
             { label: '出金', value: 1 },
             { label: '入金', value: 2 },

src/packages/pc/views/query/inoutapply/list/index.vue

@@ -38,7 +38,7 @@ filterOptons.buttonList = [
 filterOptons.selectList = [
     {
         key: 'querytype',
-        selectedValue: 1,
+        selectedValue: 2,
         options: [
             { label: '出金', value: 1 },
             { label: '入金', value: 2 },
@@ -47,7 +47,7 @@ filterOptons.selectList = [
     }
 ]
 
-const { loading, dataList, run } = useRequest(queryAccountInOutApply, { manual: true })
+const { loading, dataList, run } = useRequest(queryAccountInOutApply, { })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'extoperateid', label: '流水号' },

src/packages/pc/views/query/performance/sell/all/index.vue

@@ -44,7 +44,7 @@ const filterDate = shallowRef<string[]>([])
 const { loading, dataList, run } = useRequest(queryPerformancePlan, {
     params: {
         buyorsell: BuyOrSell.Sell
-    },
+    }
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([