Merge remote-tracking branch 'websoft/dev'

src/option/system/mpUser.js

@@ -203,10 +203,9 @@ export default {
       overHidden: true,
       hide: true,
       addDisplay: false,
-      editDisplay: true,
+      editDisplay: false,
       viewDisplay: true,
       order: 40,
-      placeholder: '可清空以解绑微信',
     },
     {
       label: '状态',

src/views/business/components/waybill-manage-page.vue

@@ -1607,7 +1607,7 @@
             v-if="canConfirmReturn(row)"
             @click="handleAction('confirmReturn', row)"
           >
-            确认回单
+            {{ completeActionLabel }}
           </el-link>
           <el-link type="primary" v-if="canMaintainMileage(row)" @click="openMileageDialog(row)">
             维护里程
@@ -5168,8 +5168,12 @@ export default {
         return false;
       }
       const status = this.statusValue(row);
-      // 待回单确认也可直接完成，不经确认回单
-      return status === 'processing' || status === 'running' || status === 'pending_return_confirm';
+      // 待回单确认的「完成」由确认回单入口承担（走打卡节点与未了结异常校验）；
+      // 只有确认回单不可用时才退回这里的普通完成
+      if (status === 'pending_return_confirm') {
+        return !this.canConfirmReturn(row);
+      }
+      return status === 'processing' || status === 'running';
     },
     canConfirmReturn(row) {
       return (
@@ -10215,12 +10219,12 @@ export default {
         cancel: '取消',
         complete: this.completeActionLabel,
         reassign: '重新派单',
-        confirmReturn: '确认回单',
+        confirmReturn: '完成',
       }[action];
-      // 确认回单是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
+      // 回单确认是终态动作（本轮不做撤销），把后果写在提示里，别让人以为还能退回
       const confirmText =
         action === 'confirmReturn'
-          ? '确认回单后该运单将置为已完成，且不可撤销。是否继续?'
+          ? '回单确认后该运单将置为已完成，且不可撤销。是否继续?'
           : `确定${actionName}该${this.config.title}?`;
       this.$confirm(confirmText, '提示', {
         confirmButtonText: '确定',

src/views/business/loading-manage.vue

@@ -898,16 +898,6 @@
         >
           <div title="配载信息" class="loading-manage-dialog__load-info-card">
             <section-card>
-              <div class="loading-manage-dialog__admission-tip">
-                <div class="loading-manage-dialog__admission-title">可配载条件</div>
-                <div class="loading-manage-dialog__admission-text">
-                  同时满足以下条件的运单可被配载：运输方式为「公路」；运单状态为「待执行」或「进行中」；未关联其他有效配载单；同一配载单的子运单须属同一项目，且承运商合同乙方须存在共同可选值（按各子单客户合同甲方匹配后取交集）。
-                </div>
-                <div class="loading-manage-dialog__admission-title">配载后状态说明</div>
-                <div class="loading-manage-dialog__admission-text">
-                  子运单：按项目过程配置是否需司机接单，无需接单则为进行中，需接单则为待执行。配载单：按所选运单所属项目的过程配置，需接单则为待执行，无需接单则为进行中。
-                </div>
-              </div>
               <div class="loading-manage-dialog__candidate-search">
                 <el-row :gutter="16">
                   <el-col :span="6">
@@ -5030,30 +5020,6 @@ export default {
     justify-content: space-between;
   }
 
-  .loading-manage-dialog__admission-tip {
-    margin-bottom: 12px;
-    padding: 12px 14px;
-    background: #f5f9ff;
-    border: 1px solid #d9ecff;
-    border-radius: 4px;
-    line-height: 1.6;
-    color: #606266;
-  }
-
-  .loading-manage-dialog__admission-title {
-    margin-bottom: 4px;
-    color: #303133;
-    font-weight: 600;
-  }
-
-  .loading-manage-dialog__admission-title + .loading-manage-dialog__admission-text + .loading-manage-dialog__admission-title {
-    margin-top: 8px;
-  }
-
-  .loading-manage-dialog__admission-text {
-    font-size: 13px;
-  }
-
   .loading-manage-dialog__candidate-search {
     padding: 0;
     margin-bottom: 0;

src/views/system/mp-user.vue

@@ -26,9 +26,6 @@
         <el-button type="primary" plain v-if="permission.mp_user_reset" @click="handleReset">
           密码重置
         </el-button>
-        <el-button type="danger" plain v-if="permission.mp_user_delete" @click="handleDelete">
-          批量删除
-        </el-button>
       </template>
       <template #identities="{ row }">
         {{ row.identitiesName || formatIdentities(row.identities) }}
@@ -102,9 +99,6 @@
         <el-link type="primary" v-if="permission.mp_user_reset" @click="handleResetForRow(row)">
           重置密码
         </el-link>
-        <el-link type="danger" v-if="permission.mp_user_delete" @click="rowDel(row)">
-          删除
-        </el-link>
       </template>
       <template #menu-form="{ size }">
         <el-button
@@ -121,7 +115,7 @@
 
 <script>
 import { h } from 'vue';
-import { getList, getDetail, submit, remove, changeStatus, resetPassword } from '@/api/system/mpUser';
+import { getList, getDetail, submit, changeStatus, resetPassword } from '@/api/system/mpUser';
 import { getDeptTree } from '@/api/system/dept';
 import option from '@/option/system/mpUser';
 import { mapGetters } from 'vuex';
@@ -159,7 +153,6 @@ export default {
       return {
         addBtn: this.validData(this.permission.mp_user_add, false),
         viewBtn: this.validData(this.permission.mp_user_view, false),
-        delBtn: this.validData(this.permission.mp_user_delete, false),
         editBtn: this.validData(this.permission.mp_user_edit, false),
       };
     },
@@ -345,35 +338,6 @@ export default {
         () => loading()
       );
     },
-    rowDel(row) {
-      this.$confirm('确定删除该小程序用户?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => remove(row.id))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message.success('操作成功');
-        });
-    },
-    handleDelete() {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
-        return;
-      }
-      this.$confirm('确定删除选中的小程序用户?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => remove(this.ids))
-        .then(() => {
-          this.onLoad(this.page);
-          this.$message.success('操作成功');
-          this.$refs.crud.toggleSelection();
-        });
-    },
     handleStatus(row) {
       const status = row.status === 1 ? 0 : 1;
       const text = status === 1 ? '启用' : '停用';