feat: 需求更新

src/views/create-order/components/paymentPlanModule.vue

@@ -94,7 +94,7 @@ export default {
       type: [String, Number],
       default: 0,
       validator(v) {
-        return agreeStatusOptions.map(a => a.value).includes(v)
+        return agreeStatusOptions.map(a => a.value).concat(-1).includes(v)
       }
     },
     contractTime: {

src/views/create-order/components/schema-form/schema-form.vue

@@ -813,6 +813,7 @@ export default {
         allTotal += (subAccountNumbers.freeCount - 0) || 0
       }
       main.props.text = `付费${mainAccountCount}个&nbsp;&nbsp;合计：<span class="text-color-main">${allTotal}</span>个`
+      main.props.text = `${mainAccountCount}个`
       // 续费升级
       if (payment === 2) {
         // 续费。取当前关联订单服务中的个数

src/views/create-order/data/interface.js

@@ -9,10 +9,11 @@ export const defaultPageFormValue = {
   userTel: '', // 联系人电话
   accountTel: '', // 权益开通电话
   noPhoneValue: [], // 无手机号
+
   // 产品信息
-  channelCommission: '0', // 渠道佣金
+  channelCommission: '0', // 销售费用
   // 协议信息
-  agreeStatus: 1, // 协议状态
+  agreeStatus: -1, // 协议状态：1签协议 0不签协议
   signUnit: 'h01',
   orderMoney0Type: '1', // 0元订单类型
   // 协议信息-文档协议

src/views/create-order/hooks/checkRequired.js

@@ -66,6 +66,10 @@ export async function checkRequired({ pageForm, productInfoList } = {}) {
   //   return
   // }
 
+  if (pageForm.agreeStatus < 0) {
+    showMessage('协议状态为必填')
+    return false
+  }
   // 协议信息校验
   // 区分是否要签电子协议(从store中取值)
   const needESign = false // showOnlineContractForm 

src/views/order/orderReview.vue

@@ -48,7 +48,16 @@
         <cascaderMulti class="truecascader" placeholder="业绩归属部门" v-model="saleCodeModel" :data="saleDeplist" multiple
           @on-change="saleDepChange" style="marginRight:10px;" :disabled="saleDis"></cascaderMulti>
       </template>
-      <Table class="table-container" ellipsis :loading="loading" ref="selection" :columns="columns" :data="list.lists || []" stripe></Table>
+      <Table
+        class="table-container"
+        ellipsis
+        :loading="loading"
+        ref="selection"
+        :columns="columns"
+        :data="list.lists || []"
+        @on-row-click="rowClick"
+        stripe
+      ></Table>
     </new-table-lists>
 
     <!-- 订单详情弹窗 -->
@@ -120,6 +129,14 @@ export default {
         this.filter.auditStatus = '-1'
       }
     },
+    rowClick(row) {
+      const sources = JSON.parse(row.filter || '{}').source ? JSON.parse(row.filter || '{}').source : ''
+      const news = this.$router.resolve({
+        path: '/order/detail/' + row.order_code,
+        query: {id: row.id, proType: row.product_type, type: sources,otherType:row.orderProducttype}
+      })
+      window.open(news.href, '_blank')
+    },
     async operateOrder(row, opera = false) { //操作 审核or查看
       this.reviewing.showReviewModule = opera
       this.reviewing.orderCode = row.order_code
@@ -276,7 +293,20 @@ export default {
         {
           title: '订单编号',
           key: 'order_code',
-          align: 'center'
+          align: 'center',
+          render(h, { row }) {
+            return h(
+              'div',
+              {
+                style: {
+                  color: '#2d8cf0'
+                }
+              },
+              [
+                h('span', row.order_code)
+              ]
+            )
+          }
         },
         {
           title: '产品类型',
@@ -444,7 +474,8 @@ export default {
                   margin: '5px'
                 },
                 on: {
-                  click: () => {
+                  click: (e) => {
+                    e.stopPropagation()
                     this.operateOrder(row)
                   }
                 }
@@ -460,7 +491,8 @@ export default {
                   margin: '5px'
                 },
                 on: {
-                  click: () => {
+                  click: (e) => {
+                    e.stopPropagation()
                     this.operateOrder(row, true)
                   }
                 }