优化加websocket路径修改

.env.development

@@ -49,4 +49,4 @@ VUE_APP_PRODUCTIVITY_PLATFORM_URL=http://127.0.0.1:8080/#/home/index
 
 # 只有以VUE_APP_开头的变量才会被webpack.DefinePlugin静态嵌入到客户端侧的包中
 
-VUE_APP_WEBSOCKET = ws://127.0.0.1:8088/api/ws
+VUE_APP_WEBSOCKET = ws://127.0.0.1:8088/ws/api/ws

.env.production

@@ -45,4 +45,4 @@ VUE_APP_ONLYOFFICE_API_URL=$VUE_APP_ONLYOFFICE_SERVER/web-apps/apps/api/document
 # 生产力平台URL
 VUE_APP_PRODUCTIVITY_PLATFORM_URL=http://doc.scdayou.com/prod/
 
-VUE_APP_WEBSOCKET = ws://mbs.scdayou.com/api/ws
+VUE_APP_WEBSOCKET = ws://mbs.scdayou.com/ws/api/ws

src/views/finance/assetsRealFundStat.vue

@@ -48,7 +48,7 @@
                     <el-button class="filter-item" round type="info" @click="exportAssetsStat()" :disabled="exportStatus">导出
                     </el-button>
                 </template>
-                <el-table size="medium" slot="table" row-key="id" :data="pageData.records" fit highlight-current-row
+                <el-table size="medium" slot="table" row-key="id" :data="pageData.records" fit highlight-current-row border
                     :header-row-style="{ color: '#333333' }"
                     style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">
                     <el-table-column label="归档状况" width="80" align="center">

src/views/finance/calculateAssets.vue

@@ -29,7 +29,7 @@
                     </el-button>
                 </div>
                 <div style="width: 100%;">
-                    <el-table :data="evaluatorAmount" fit stripe highlight-current-row @row-click="evaluatorAmountDetail"
+                    <el-table :data="evaluatorAmount" fit stripe highlight-current-row @row-click="evaluatorAmountDetail" border
                         :header-row-style="{ color: '#333333', 'font-size': '14px' }" style=" width: 18.1%; float: left;
                     border-left: 1px solid #ebeced;
                     border-right: 1px solid #ebeced;
@@ -51,7 +51,7 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <el-table :data="evaluatorProd" fit stripe highlight-current-row
+                    <el-table :data="evaluatorProd" fit stripe highlight-current-row border
                         :header-row-style="{ color: '#333333', 'font-size': '14px' }" style=" width: 80.5%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;
@@ -150,7 +150,7 @@
                     </el-button>
                 </div>
                 <div style="width: 100%;">
-                    <el-table :data="marketAmount" fit stripe highlight-current-row @row-click="marketAmountDetail"
+                    <el-table :data="marketAmount" fit stripe highlight-current-row @row-click="marketAmountDetail" border
                         :header-row-style="{ color: '#333333', 'font-size': '14px' }" style=" width: 18.1%; float: left;
                     border-left: 1px solid #ebeced;
                     border-right: 1px solid #ebeced;
@@ -167,7 +167,7 @@
                             </template>
                         </el-table-column>
                     </el-table>
-                    <el-table :data="marketProd" fit stripe highlight-current-row
+                    <el-table :data="marketProd" fit stripe highlight-current-row border
                         :header-row-style="{ color: '#333333', 'font-size': '14px' }" style=" width: 80.5%; float: right;
                       border-left: 1px solid #ebeced;
                       border-right: 1px solid #ebeced;

src/views/finance/calculateMajor.vue

@@ -28,7 +28,7 @@
               <el-table  :data="evaluatorAmount" 
                 fit
                 stripe
-                highlight-current-row
+                highlight-current-row border
                 @row-click="evaluatorAmountDetail"
                 :header-row-style="{ color: '#333333','font-size':'14px'}"
                 style=" width: 18.1%; float: left;
@@ -50,7 +50,7 @@
               <el-table :data="evaluatorProd" 
                   fit
                   stripe
-                  highlight-current-row
+                  highlight-current-row border
                   :header-row-style="{ color: '#333333','font-size':'14px'}"
                   style=" width: 80.5%; float: right;
                     border-left: 1px solid #ebeced;
@@ -144,7 +144,7 @@
               <el-table  :data="marketAmount" 
                 fit
                 stripe
-                highlight-current-row
+                highlight-current-row border
                 @row-click="marketAmountDetail"
                 :header-row-style="{ color: '#333333','font-size':'14px'}"
                 style=" width: 18.1%; float: left;
@@ -166,7 +166,7 @@
               <el-table :data="marketProd" 
                   fit
                   stripe
-                  highlight-current-row
+                  highlight-current-row border
                   :header-row-style="{ color: '#333333','font-size':'14px'}"
                   style=" width: 80.5%; float: right;
                     border-left: 1px solid #ebeced;

src/views/finance/personalRealFundStat.vue

@@ -33,7 +33,7 @@
       <el-table
         size="medium"
         slot="table"
-        row-key="id"
+        row-key="id" border
         :data="personalStat.records"
         fit
         highlight-current-row

src/views/finance/realFundStat.vue

@@ -36,7 +36,7 @@
           slot="table"
           row-key="id"
           :data="majorStat.records"
-          fit
+          fit border
           highlight-current-row
           :header-row-style="{color: '#333333'}"
           style="border-left: 1px solid #EBECED;border-right: 1px solid #EBECED;color: #333333;">

src/views/major/myOrder.vue

@@ -117,7 +117,9 @@
         <el-table-column label="送达状态" align="center"
         prop="delivery" v-if="!hiddenLabels.includes('delivery')" width='120'>
           <template slot-scope="{row}">
-            <span>{{ row.delivery ? '已送达' : '--' }}</span>
+            <span v-if="row.delivery">{{ row.delivery ? '已送达' : '--' }}</span>
+            <el-button v-else-if="!row.delivery && row.production" type="text" @click="noTaskConfirmDelivery(row.id)">标记送达</el-button>
+            <span v-else>--</span>
           </template>
         </el-table-column>
         <el-table-column label="下单时间" align="center"
@@ -131,9 +133,9 @@
             <PermissionButton menu-code="_views_myOrder_detail" class-name="filter-item" type="text" :page-jump="true"
               size="mini"
               :page-query="{ 'couldEdit': true, 'id': row.businessId, 'back': '/major/my/order', 'recall': true, 'couldBack': true, 'orderId': row.orderId }" />
-            <el-button :disabled="!row.id" type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
+            <el-button type="text" size="small" @click="openShouldAmountDialog(row)">应收款</el-button>
             <!-- <el-button type="text" size="small" @click="openAllotProductionDialog(row)">实收款分配</el-button> -->
-            <el-button :disabled="!row.id" type="text" size="small"
+            <el-button  type="text" size="small"
               @click="openFinanceInvoiceDialog(row.orderFundId, row.realAmount, row.clienteleName, row.clienteleSubName, row.productionFundId)">申请开票</el-button>
             <el-button type="text" size="small" @click="productionList(row.businessId)">产品包</el-button>
           </template>
@@ -1239,6 +1241,7 @@ export default {
               duration: 2000
             });
             this.productionListDialog = false;
+            this.getList();
           } else {
             this.$notify({
               title: '失败',