huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
fixLog V2.4.8
yujialong 1 year ago
parent 7f1c4ef666
commit 117dcd2537
7 changed files with 2191 additions and 1666 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/components/Header.vue
  2. 364
      src/components/codemirror.vue
  3. 2
      src/setting.js
  4. 1
      src/utils/api.js
  5. 2276
      src/views/customer/AddCustomer.vue
  6. 98
      src/views/order/AddOrder.vue
  7. 1112
      src/views/parnerOperation/schemeSet.vue

4
src/components/Header.vue
Unescape View File

@ -74,8 +74,8 @@ export default {
},
initSocket ({ id, account }) {
// 实例化socket
// this.socket = new WebSocket(`ws://${Setting.isDev ? '192.168.31.51' : location.host}:9100/nakadai/websocket/${id}/${account}`)
this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
this.socket = new WebSocket(`wss://${Setting.isDev ? '192.168.31.51' : location.host}/nakadai/websocket/${id}/${account}`)
// this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
// 监听socket连接
this.socket.onopen = this.open;
// 监听socket错误信息

364
src/components/codemirror.vue
Unescape View File

@ -1,37 +1,45 @@
<template>
<div class="wrap">
<div class="left">
<codemirror
v-model="codeVal"
:options="cmOption"
class="code-mirror"
@ready="ready"
ref="codemirror"
></codemirror>
<el-button
class="run btn"
type="primary"
@click="runCode"
>运行</el-button>
<codemirror v-model="codeVal"
:options="cmOption"
class="code-mirror"
@ready="ready"
ref="codemirror"></codemirror>
<el-button class="run btn"
type="primary"
@click="runCode">运行</el-button>
</div>
<div class="code-right answer">
<p class="text-wrapper">{{ runResult }}</p>
<div class="pic-wrap" v-if="picSrcList.length">
<div class="pic-item" v-for="(img, i) in picSrcList" :key="i">
<el-image
class="pic"
:src="img"
:preview-src-list="picSrcList">
<div class="pic-wrap"
v-if="picSrcList.length">
<div class="pic-item"
v-for="(img, i) in picSrcList"
:key="i">
<el-image class="pic"
:src="img"
:preview-src-list="picSrcList">
</el-image>
<el-button class="download-btn btn" type="primary" size="mini" @click="downloadPic(i)">下载图片</el-button>
<a :ref="'picLink' + i" style="display: none;" download="运行结果.png" :href="img">下载图片</a>
<el-button class="download-btn btn"
type="primary"
size="mini"
@click="downloadPic(i)">下载图片</el-button>
<a :ref="'picLink' + i"
style="display: none;"
download="运行结果.png"
:href="img">下载图片</a>
</div>
</div>
<div class="result-right t-color" v-show="isError">
<img src="@/assets/img/yes.png" alt />运行成功
<div class="result-right t-color"
v-show="isError">
<img src="@/assets/img/yes.png"
alt />运行成功
</div>
<div class="result-wrong" v-show="isError === 0">
<img src="@/assets/img/error.png" alt />
<div class="result-wrong"
v-show="isError === 0">
<img src="@/assets/img/error.png"
alt />
第{{errLine}}行出现错误
</div>
</div>
@ -82,7 +90,7 @@ import "codemirror/theme/base16-light.css";
import { Loading } from 'element-ui';
export default {
props: ['code', 'codeId', 'projectId', 'retResult', 'readOnly'],
data() {
data () {
return {
codeVal: this.code,
runResult: '', // 运行结果
@ -122,25 +130,25 @@ export default {
codemirror
},
watch: {
codeVal(val) {
codeVal (val) {
this.$emit("update:code", val)
}
},
mounted() {
mounted () {
},
methods: {
// 页面加载完后重置编辑框大小
ready() {
ready () {
const code = this.$refs.codemirror.codemirror
code.setSize("auto", "calc(100vh - 370px)");
code.on('keypress', function() {
code.on('keypress', function () {
// 显示智能提示
code.showHint()
});
},
// 运行代码
runCode() {
runCode () {
let code = this.codeVal
if (!code) {
this.$message({
@ -169,7 +177,7 @@ export default {
let firtImg = ''
try {
imgList = eval(result)
} catch (error) {}
} catch (error) { }
if (imgList && imgList.length) firtImg = imgList[0]
// 如果是下载图片的代码，则要显示图片和运行结果，不用显示对错，换成显示下载图片
if (photo) {
@ -182,7 +190,7 @@ export default {
* 这段是为要下载图片的项目案例写的，后端会返回图片名称的数组，前端负责循环这个数组，然后下载下来
* 只有该系统有这段代码，因为其他7个系统没有下载图片的项目，后续如果加了，直接把这段代码复制过去即可
*/
imgList.map((n,i) => {
imgList.map((n, i) => {
// util.downloadFile(`${i+1}.jpg`,n)
})
this.isError = 0
@ -202,7 +210,7 @@ export default {
}
},
// 下载图片
downloadPic(i) {
downloadPic (i) {
this.$refs['picLink' + i][0].click()
}
}
@ -211,176 +219,174 @@ export default {
<style lang="scss" scoped>
::-webkit-scrollbar {
width: 8px;
height: 8px;
width: 8px;
height: 8px;
}
::-webkit-scrollbar-thumb {
width: 5px;
border-radius: 6px;
background: rgba(173,173,173,.7);
width: 5px;
border-radius: 6px;
background: rgba(173, 173, 173, 0.7);
}
.wrap {
display: flex;
display: flex;
}
.left {
position: relative;
width: calc(100% - 400px);
}
.left{
position: relative;
width: calc(100% - 400px);
.code-mirror {
line-height: 30px;
}
.text-wrapper {
white-space: pre-wrap;
white-space: pre-wrap;
}
/deep/.answer {
.el-tab-pane {
padding: 0 10px;
height: 340px;
overflow: hidden;
overflow-y: auto;
white-space: pre-wrap;
}
.el-dialog--center {
width: 500px;
height: 500px;
}
.el-dialog__title {
font-size: 22px;
font-weight: 500;
}
.el-tabs__nav-wrap::after {
background-color: #333;
}
.el-tabs__active-bar {
height: 0;
background-color: #fff;
}
.el-tabs__header {
background-color: #333;
}
.el-dialog--center .el-dialog__body {
padding: 0;
}
.el-tabs__item {
width: 80px;
color: #fff;
}
.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
padding-left: 20px;
}
.el-tabs__item.is-active {
color: #fff !important;
background-color: #333 !important;
}
.tips-btn {
margin-top: 10px;
height: 40px;
width: 90px;
border: none;
position: absolute;
right: 0;
background: rgba(255, 49, 49, 1);
color: rgba(255, 255, 255, 1);
&:hover,
&:focus,
&:active {
background: rgba(255, 49, 49, 1);
color: rgba(255, 255, 255, 1);
.el-tab-pane {
padding: 0 10px;
height: 340px;
overflow: hidden;
overflow-y: auto;
white-space: pre-wrap;
}
.el-dialog--center {
width: 500px;
height: 500px;
}
.el-dialog__title {
font-size: 22px;
font-weight: 500;
}
.el-tabs__nav-wrap::after {
background-color: #333;
}
.el-tabs__active-bar {
height: 0;
background-color: #fff;
}
.el-tabs__header {
background-color: #333;
}
.el-dialog--center .el-dialog__body {
padding: 0;
}
.el-tabs__item {
width: 80px;
color: #fff;
}
.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
padding-left: 20px;
}
.el-tabs__item.is-active {
color: #fff !important;
background-color: #333 !important;
}
.tips-btn {
margin-top: 10px;
height: 40px;
width: 90px;
border: none;
position: absolute;
right: 0;
background: rgba(255, 49, 49, 1);
color: rgba(255, 255, 255, 1);
&:hover,
&:focus,
&:active {
background: rgba(255, 49, 49, 1);
color: rgba(255, 255, 255, 1);
}
}
}
}
/deep/.CodeMirror-wrap pre.CodeMirror-line,
.CodeMirror-wrap pre.CodeMirror-line-like {
height: 30px;
line-height: 30px;
}
.result-right {
background-color: rgba(43, 40, 22, 1);
background-color: rgba(43, 40, 22, 1);
}
.result-wrong {
background-color: rgba(43, 22, 22, 1);
color: #f00;
background-color: rgba(43, 22, 22, 1);
color: #f00;
}
.result-wrong,
.result-right {
position: absolute;
left: 20px;
right: 20px;
display: flex;
align-items: center;
bottom: 10px;
padding: 5px 10px;
img {
width: 40px;
height: 40px;
margin-top: 5px;
margin-right: 10px;
}
position: absolute;
left: 20px;
right: 20px;
display: flex;
align-items: center;
bottom: 10px;
padding: 5px 10px;
img {
width: 40px;
height: 40px;
margin-top: 5px;
margin-right: 10px;
}
}
.code-right {
width: 500px;
color: #fff;
background: #1b1b1b;
display: inline-block;
position: relative;
overflow-x: auto;
p {
font-size: 18px;
margin: 10px;
position: absolute;
width: calc(100% - 14px);
top: 0;
bottom: -8px;
overflow: auto;
}
width: 500px;
color: #fff;
background: #1b1b1b;
display: inline-block;
position: relative;
overflow-x: auto;
p {
font-size: 18px;
margin: 10px;
position: absolute;
width: calc(100% - 14px);
top: 0;
bottom: -8px;
overflow: auto;
}
}
.pic-wrap {
position: absolute;
left: 0;
right: 0;
bottom: 5px;
display: flex;
max-width: calc(100% - 50px);
margin: 0 auto;
text-align: center;
overflow: auto;
.pic-item {
margin: 0 5px 5px;
&:only-child {
.pic {
width: 80%;
}
position: absolute;
left: 0;
right: 0;
bottom: 5px;
display: flex;
max-width: calc(100% - 50px);
margin: 0 auto;
text-align: center;
overflow: auto;
.pic-item {
margin: 0 5px 5px;
&:only-child {
.pic {
width: 80%;
}
}
}
.pic {
display: block;
width: 100px;
margin: 0 auto 10px;
}
}
.pic {
display: block;
width: 100px;
margin: 0 auto 10px;
}
}
.code-mask{
z-index: 2;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
.code-mask {
z-index: 2;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}
.run{
z-index:99;
position:absolute;
right: 50px;
bottom:15px;
width:100px;
color:#fff;
.run {
z-index: 99;
position: absolute;
right: 50px;
bottom: 15px;
width: 100px;
color: #fff;
}
.download-btn{
color:#fff;
.download-btn {
color: #fff;
}
/deep/.answer-wrap{
pre{
width: 100%;
white-space: pre-wrap;
}
img{
max-width: 100%;
}
/deep/.answer-wrap {
pre {
width: 100%;
white-space: pre-wrap;
}
img {
max-width: 100%;
}
}
</style>

2
src/setting.js
Unescape View File

@ -11,7 +11,7 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/'
host = 'http://192.168.31.152:9000/'// 榕
// host = 'http://192.168.31.152:9000/'// 榕
// host = 'http://192.168.31.51:9000/'// 赓
} else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/'

1
src/utils/api.js
Unescape View File

@ -44,6 +44,7 @@ export default {
getProductsSubscribedByCustomers: `nakadai/nakadai/customer/getProductsSubscribedByCustomers`,
orderBulkDisableEnable: `nakadai/nakadai/orderOther/orderBulkDisableEnable`,
exportSubscribedRecords: `nakadai/nakadai/order/exportSubscribedRecords`,
addNewCustomersByOneself: `nakadai/nakadai/school/addNewCustomersByOneself`,
resetPwdCustomer: `nakadai/nakadai/customer/resetPwd`,
queryCustomerIsExists: `nakadai/nakadai/customer/queryCustomerIsExists`,

2276
src/views/customer/AddCustomer.vue
View File

File diff suppressed because it is too large Load Diff

98
src/views/order/AddOrder.vue
Unescape View File

@ -187,7 +187,7 @@
round
@click="batchDeliver(0, 0)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
<el-button v-if="!viewDisabled&&!isEdit&&!renewDisabled"
type="primary"
round
@click="addCourseJurisdiction(1)">添加</el-button>
@ -216,7 +216,7 @@
<div class="small">
<el-input class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
@ -224,7 +224,7 @@
placeholder="输入时间"></el-input>
<el-select class="time-select"
v-model="scope.row.options"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
<el-option label="日"
@ -246,7 +246,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -256,7 +256,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -341,7 +341,7 @@
width="180">
<template slot-scope="scope">
<div class="flex-c-c">
<el-button v-if="!editDisabled&&!viewDisabled"
<el-button v-if="!isEdit&&!viewDisabled"
type="text"
@click="delCourseForm(scope.$index, scope.row)"
style="margin-right:10px;">删除</el-button>
@ -399,7 +399,7 @@
round
@click="batchDeliver(0, 5)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
<el-button v-if="!viewDisabled&&!isEdit&&!renewDisabled"
type="primary"
round
@click="addCourseJurisdiction(2)">添加</el-button>
@ -428,7 +428,7 @@
<div class="small">
<el-input class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
@ -436,7 +436,7 @@
placeholder="输入时间"></el-input>
<el-select class="time-select"
v-model="scope.row.options"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
<el-option label="日"
@ -458,7 +458,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -468,7 +468,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -553,7 +553,7 @@
width="180">
<template slot-scope="scope">
<div class="flex-c-c">
<el-button v-if="!editDisabled&&!viewDisabled"
<el-button v-if="!isEdit&&!viewDisabled"
type="text"
@click="delCourseDataForm(scope.$index, scope.row)"
style="margin-right:10px;">删除</el-button>
@ -611,7 +611,7 @@
round
@click="batchDeliver(0, 1)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
<el-button v-if="!viewDisabled&&!isEdit&&!renewDisabled"
type="primary"
round
class="mag"
@ -641,7 +641,7 @@
<div class="small">
<el-input class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
@ -650,7 +650,7 @@
<span style="margin-left:5px">
<el-select class="time-select"
v-model="scope.row.options"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
<el-option label="日"
@ -673,7 +673,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -683,7 +683,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -794,7 +794,7 @@
width="180">
<template slot-scope="scope">
<div class="flex-c-c">
<el-button v-if="!editDisabled&&!viewDisabled"
<el-button v-if="!isEdit&&!viewDisabled"
type="text"
@click="delDataForm(scope.$index, scope.row)"
style="margin-right:10px;">删除</el-button>
@ -845,7 +845,7 @@
round
@click="batchDeliver(0, 2)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
<el-button v-if="!viewDisabled&&!isEdit&&!renewDisabled"
type="primary"
round
class="mag"
@ -875,7 +875,7 @@
<div class="small">
<el-input class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
@ -884,7 +884,7 @@
<span style="margin-left:5px">
<el-select class="time-select"
v-model="scope.row.options"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options)">
<el-option label="日"
@ -907,7 +907,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择使用日期">
</el-date-picker>
</p>
@ -916,7 +916,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -994,7 +994,7 @@
width="180">
<template slot-scope="scope">
<div class="flex-c-c">
<el-button v-if="!editDisabled&&!viewDisabled"
<el-button v-if="!isEdit&&!viewDisabled"
type="text"
@click="delDataFormList(scope.$index, scope.row)"
style="margin-right:10px;">删除</el-button>
@ -1045,7 +1045,7 @@
round
@click="batchDeliver(0, 3)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
<el-button v-if="!viewDisabled&&!isEdit&&!renewDisabled"
type="primary"
round
class="mag"
@ -1076,7 +1076,7 @@
<div class="small">
<el-input class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
@ -1084,7 +1084,7 @@
placeholder="输入时间"></el-input>
<el-select class="time-select"
v-model="scope.row.options"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
<el-option label="日"
@ -1106,7 +1106,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -1116,7 +1116,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -1197,7 +1197,7 @@
<el-button style="margin-right: 10px;"
type="text"
@click="showShip(scope.row)">{{ viewDisabled ? '' : '编辑' }}发货内容</el-button>
<el-button v-if="!editDisabled&&!viewDisabled"
<el-button v-if="!isEdit&&!viewDisabled"
type="text"
@click="delPracticalCourses(scope.$index, scope.row)"
style="margin: 0 10px;">删除</el-button>
@ -1255,7 +1255,7 @@
round
@click="batchDeliver(0, 4)">取消全部发货</el-button>
</template>
<el-button v-if="!viewDisabled&&!editDisabled&&!renewDisabled"
<el-button v-if="!viewDisabled&&!isEdit&&!renewDisabled"
type="primary"
round
class="mag"
@ -1286,7 +1286,7 @@
<div class="small">
<el-input class="time-input"
:class="!scope.row.periodOfUse&&whetherSubmit?'red':''"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
maxlength="4"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
@input="scope.row.periodOfUse = scope.row.periodOfUse.replace(/[^0-9.]/g,'')"
@ -1294,7 +1294,7 @@
placeholder="输入时间"></el-input>
<el-select class="time-select"
v-model="scope.row.options"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
placeholder="请选择"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)">
<el-option label="日"
@ -1316,7 +1316,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -1326,7 +1326,7 @@
style="width:130px"
v-model="scope.row.startTime"
type="date"
:disabled="viewDisabled||editDisabled"
:disabled="viewDisabled||isEdit"
@change="deadLine(scope.row.periodOfUse,scope.row,scope.row.options, 1)"
placeholder="请选择使用日期">
</el-date-picker>
@ -1407,7 +1407,7 @@
<el-button style="margin-right: 10px;"
type="text"
@click="showShip(scope.row)">{{ viewDisabled ? '' : '编辑' }}发货内容</el-button>
<el-button v-if="!editDisabled&&!viewDisabled"
<el-button v-if="!isEdit&&!viewDisabled"
type="text"
@click="delExpTool(scope.$index, scope.row)"
style="margin-right:10px;">删除</el-button>
@ -1743,11 +1743,12 @@ export default {
loading: false,// 页面加载
isAdd: false, // 是否添加
viewDisabled: false,// 查看禁用
editDisabled: false,// 编辑禁用
editDisabled: false,// 编辑和处理禁用
isEdit: false, // 编辑
renewDisabled: false,// 续费禁用
dataLoading: false,// 产品弹框加载
whetherSubmit: false,/* 提交否 */
dispose: false,
dispose: false, // 处理
showSelectClient: false,// 切换展示选择客户页
form: {// 基本信息
// orderNumber: '',// 编号
@ -1954,6 +1955,7 @@ export default {
this.dispose = true;
} else {
this.titlesw = '修改订单'
this.isEdit = true
}
this.editDisabled = true;
await this.getDetail(this.$route.query.orderId);
@ -2031,8 +2033,7 @@ export default {
this.$post(this.api.renew, {
authority: 1,
customerId,
productId: orderOther.filter(e => e.authority === 1).map(e => e.dataOrCourseId),
mallId: orderOther.filter(e => e.authority === 1).map(e => e.mallId),
productId: orderOther.filter(e => e.authority === 1).map(e => e.mallId),
}).then(({ orderOthers }) => {
list.push(...orderOthers)
resolve()
@ -2044,8 +2045,7 @@ export default {
this.$post(this.api.renew, {
authority: 0,
customerId,
productId: orderOther.filter(e => !e.authority).map(e => e.dataOrCourseId),
mallId: orderOther.filter(e => !e.authority).map(e => e.mallId),
productId: orderOther.filter(e => !e.authority).map(e => e.mallId),
}).then(({ orderOthers }) => {
list.push(...orderOthers)
resolve()
@ -2057,8 +2057,7 @@ export default {
this.$post(this.api.renew, {
authority: 2,
customerId,
productId: orderOther.filter(e => e.authority === 2).map(e => e.dataOrCourseId),
mallId: orderOther.filter(e => e.authority === 2).map(e => e.mallId),
productId: orderOther.filter(e => e.authority === 2).map(e => e.mallId),
}).then(({ orderOthers }) => {
list.push(...orderOthers)
resolve()
@ -2070,8 +2069,7 @@ export default {
this.$post(this.api.renew, {
authority: 3,
customerId,
productId: orderOther.filter(e => e.authority === 3).map(e => e.dataOrCourseId),
mallId: orderOther.filter(e => e.authority === 3).map(e => e.mallId),
productId: orderOther.filter(e => e.authority === 3).map(e => e.mallId),
}).then(({ orderOthers }) => {
list.push(...orderOthers)
resolve()
@ -2084,8 +2082,7 @@ export default {
authority: 4,
// authority: 3,
customerId,
productId: orderOther.filter(e => e.authority === 4).map(e => e.dataOrCourseId),
mallId: orderOther.filter(e => e.authority === 4).map(e => e.mallId),
productId: orderOther.filter(e => e.authority === 4).map(e => e.mallId),
}).then(({ orderOthers }) => {
list.push(...orderOthers)
resolve()
@ -2580,10 +2577,8 @@ export default {
})
};
const productId = []
const mallId = []
this.practicalCoursesSelect.map(e => {// 取得选中的值，进行赋值
e.associatedProduct && productId.push(+e.associatedProduct);
mallId.push(e.mallId)
productId.push(e.mallId)
let find = this[name].some(i => e.mallId === i.mallId);// 判断已有的相同的id不进行处理
if (!find) {
// 查询产品管理设置的平台结算价
@ -2605,7 +2600,6 @@ export default {
authority,
customerId: this.form.customerId,
productId,
mallId
}).then(res => {
this[name].map(e => {
res.orderOthers.map(el => {

1112
src/views/parnerOperation/schemeSet.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save