diff --git a/src/components/Header.vue b/src/components/Header.vue index dd42068..6a85fb8 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -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错误信息 diff --git a/src/components/codemirror.vue b/src/components/codemirror.vue index 3ad9798..7a8cf69 100644 --- a/src/components/codemirror.vue +++ b/src/components/codemirror.vue @@ -1,37 +1,45 @@ - 添加 @@ -216,7 +216,7 @@
@@ -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="请选择使用日期"> @@ -341,7 +341,7 @@ width="180"> - 添加 @@ -428,7 +428,7 @@
@@ -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="请选择使用日期"> @@ -553,7 +553,7 @@ width="180"> - @@ -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="请选择使用日期"> @@ -794,7 +794,7 @@ width="180"> -

@@ -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="请选择使用日期"> @@ -994,7 +994,7 @@ width="180"> - @@ -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="请选择使用日期"> @@ -1197,7 +1197,7 @@ {{ viewDisabled ? '' : '编辑' }}发货内容 - 删除 @@ -1255,7 +1255,7 @@ round @click="batchDeliver(0, 4)">取消全部发货 - @@ -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="请选择使用日期"> @@ -1407,7 +1407,7 @@ {{ viewDisabled ? '' : '编辑' }}发货内容 - 删除 @@ -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 => { diff --git a/src/views/parnerOperation/schemeSet.vue b/src/views/parnerOperation/schemeSet.vue index c9528af..e9ba14a 100644 --- a/src/views/parnerOperation/schemeSet.vue +++ b/src/views/parnerOperation/schemeSet.vue @@ -1,112 +1,148 @@ \ No newline at end of file