Skip to content

G
gdtel-gztel-school-center-ui
Commit be3ce4d1 by 董有沛
Options

冲突修改

parents 5cff0cc1 5436d2d3
Showing with 76 additions and 14 deletions
deploy/prod/docker-gdtel-gztel-hhr/push.sh 0 → 100755
#!/bin/bash
HOST_NAME=172.18.101.172
# 每次发版都需要改的版本号
APP_VERSION=0.0.1
yarn build
APP_NAME=gdtelgztelschoolcenterui
cd $APP_NAME
rm -rf ./nginx/html/*
cp -r ../../../../dist/* ./nginx/html/
docker build -t $HOST_NAME/gdtel-gztel-school-center/$APP_NAME:$APP_VERSION . && docker push $HOST_NAME/gdtel-gztel-school-center/$APP_NAME:$APP_VERSION
package.json
......@@ -27,6 +27,7 @@
"js-cookie": "^2.2.1",
"lodash.get": "^4.4.2",
"lodash.pick": "^4.4.0",
"mavon-editor": "^2.9.0",
"md5": "^2.2.1",
"nprogress": "^0.2.0",
"qrcodejs2": "^0.0.2",
......
src/api/school-center/salesOrder.js 0 → 100644
import {postAction,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
// 智能平台账号实名
let salesOrderInfo = (params) => postAction(prefix + "/salesOrders/salesOrderInfo" , params);
let ysmUserNotThrough = (id,params) => postAction(prefix + "/ysmUser/notThrough/"+id,params);
let ysmUserInsert = (params) => postAction(prefix + "/ysmUser/insert" , params);
let ysmUserUpdate = (params) => postAction(prefix + "/ysmUser/update",params);
export {
salesOrderInfo,
ysmUserNotThrough,
ysmUserInsert,
ysmUserUpdate
}
src/api/school-center/salesOrderAPI.js → src/api/school-center/salesOrdersAPI.js
......@@ -2,19 +2,19 @@ import {postAction,getAotion,downFilePost} from '@/api/manage'
const prefix = '/manager/ciop';
// 获取活动列表
let getList = (params) => postAction(prefix + "/salesOrder/list" , params);
let getList = (params) => postAction(prefix + "/salesOrders/list" , params);
// 删除
let deleteOrder = (params) => postAction(prefix + "/salesOrder/deleteOrder" , params);
let deleteOrder = (params) => postAction(prefix + "/salesOrders/deleteOrder" , params);
// 下载放号上传模板
let downloadTemplateFH = (params) => downFilePost(prefix + "/salesOrder/downloadTemplateFH" , params);
let downloadTemplateFH = (params) => downFilePost(prefix + "/salesOrders/downloadTemplateFH" , params);
// 下载充值审核模板
let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesOrder/downloadTemplateCZ" , params);
let downloadTemplateCZ = (params) => downFilePost(prefix + "/salesOrders/downloadTemplateCZ" , params);
// 上传图片
// let uploadImg = (params) => postAction(prefix + "/salesOrder/uploadImg" , params);
// let uploadImg = (params) => postAction(prefix + "/salesOrders/uploadImg" , params);
// 获取县分下拉列表
let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/substList" , params);
......@@ -23,10 +23,10 @@ let getSubstList = (params) => postAction(prefix + "/school/schoolManagement/sub
let getSchoolList = (params) => postAction(prefix + "/school/schoolManagement/schoolList" , params);
// 下载导入结果清单
let downloadResult = (params) => downFilePost(prefix + "/salesOrder/exportResult" , params);
let downloadResult = (params) => downFilePost(prefix + "/salesOrders/exportResult" , params);
// 导出订单
let exportList = (params) => downFilePost(prefix + "/salesOrder/exportOrderList" , params);
let exportList = (params) => downFilePost(prefix + "/salesOrders/exportOrderList" , params);
export {
getList,deleteOrder,getSubstList,getSchoolList,downloadTemplateFH,downloadTemplateCZ,
......
src/views/school-center/salesOrder/salesOrder.vue → src/views/school-center/salesOrders/salesOrders.vue
......@@ -146,19 +146,18 @@
</a-col>
</a-row>
</a-modal>
</div>
</template>
<script>
import STable from '@/components/table';
import {
getList,
deleteOrder,getSubstList,getSchoolList,
downloadTemplateFH,downloadTemplateCZ,
downloadResult,exportList
} from "@/api/school-center/salesOrderAPI"
} from "@/api/school-center/salesOrdersAPI"
import {cloneObject,exportFile} from '@/utils/util';
import ImportBtn from "../../../components/sysmanage/ImportBtn";
......@@ -267,6 +266,7 @@
if (res.state !== 'success') {
this.emptyText.emptyText = '查询失败！'
this.$message.error("查询失败！", 5);
data = {
data: [],
pageSize: parameter.pageSize,
......@@ -274,9 +274,11 @@
totalCount: 0
}
} else {
if (res.data.records.length==0){
return data
}
data = {
data: res.data.records,
pageSize: parameter.pageSize,
......@@ -304,13 +306,13 @@
handleSubmit1() {
this.importTile = "放号上传";
this.FHTemplate = true;
this.importUrl = "manager/ciop/salesOrder/importOrder";
this.importUrl = "manager/ciop/salesOrders/importOrder";
this.modifyvisible = true;
},
handleSubmit2() {
this.importTile = "充值审核";
this.CZTemplate = true;
this.importUrl = "manager/ciop/salesOrder/importRechargeData";
this.importUrl = "manager/ciop/salesOrders/importRechargeData";
this.modifyvisible = true;
},
downloadTemplateFH: function() {
......@@ -376,10 +378,13 @@
}
}
}
</script>
<style scoped>
</style>
yarn.lock
......@@ -3223,7 +3223,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
dependencies:
delayed-stream "~1.0.0"
commander@2, commander@^2.18.0, commander@^2.20.0:
commander@2, commander@^2.18.0, commander@^2.20.0, commander@^2.9.0:
version "2.20.3"
resolved "https://registry.npm.taobao.org/commander/download/commander-2.20.3.tgz?cache=0&sync_timestamp=1583213806330&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha1-/UhehMA+tIgcIHIrpIA16FMa6zM=
......@@ -3664,6 +3664,11 @@ cssesc@^3.0.0:
resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
integrity sha1-N3QZGZA7hoVl4cCep0dEXNGJg+4=
cssfilter@0.0.10:
version "0.0.10"
resolved "https://registry.npm.taobao.org/cssfilter/download/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
cssnano-preset-default@^4.0.0, cssnano-preset-default@^4.0.7:
version "4.0.7"
resolved "https://registry.npm.taobao.org/cssnano-preset-default/download/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
......@@ -5752,7 +5757,12 @@ hex-color-regex@^1.1.0:
resolved "https://registry.npm.taobao.org/hex-color-regex/download/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
integrity sha1-TAb8y0YC/iYCs8k9+C1+fb8aio4=
highlight.js@^9.6.0:
highlight.js-async-webpack@^1.0.4:
version "1.0.4"
resolved "https://registry.npm.taobao.org/highlight.js-async-webpack/download/highlight.js-async-webpack-1.0.4.tgz#c06b67bf99f049045d62b756e5855b0912ec616c"
integrity sha1-wGtnv5nwSQRdYrdW5YVbCRLsYWw=
highlight.js@^9.11.0, highlight.js@^9.6.0:
version "9.18.1"
resolved "https://registry.npm.taobao.org/highlight.js/download/highlight.js-9.18.1.tgz#ed21aa001fe6252bb10a3d76d47573c6539fe13c"
integrity sha1-7SGqAB/mJSuxCj121HVzxlOf4Tw=
......@@ -7137,6 +7147,15 @@ math-expression-evaluator@^1.2.14:
resolved "https://registry.npm.taobao.org/math-expression-evaluator/download/math-expression-evaluator-1.2.22.tgz#c14dcb3d8b4d150e5dcea9c68c8dad80309b0d5e"
integrity sha1-wU3LPYtNFQ5dzqnGjI2tgDCbDV4=
mavon-editor@^2.9.0:
version "2.9.0"
resolved "https://registry.npm.taobao.org/mavon-editor/download/mavon-editor-2.9.0.tgz#e51bbcdcde18b9236333a9ceb12fed2d84542900"
integrity sha1-5Ru83N4YuSNjM6nOsS/tLYRUKQA=
dependencies:
highlight.js "^9.11.0"
highlight.js-async-webpack "^1.0.4"
xss "^1.0.6"
md5.js@^1.3.4:
version "1.3.5"
resolved "https://registry.npm.taobao.org/md5.js/download/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
......@@ -11700,6 +11719,14 @@ ws@^6.0.0, ws@^6.2.1:
dependencies:
async-limiter "~1.0.0"
xss@^1.0.6:
version "1.0.6"
resolved "https://registry.npm.taobao.org/xss/download/xss-1.0.6.tgz#eaf11e9fc476e3ae289944a1009efddd8a124b51"
integrity sha1-6vEen8R2464omUShAJ793YoSS1E=
dependencies:
commander "^2.9.0"
cssfilter "0.0.10"
xtend@^4.0.0, xtend@~4.0.1:
version "4.0.2"
resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment