Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

package.json

@@ -27,6 +27,7 @@
     "kr-print-designer": "^1.1.8",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
+    "sortablejs": "^1.15.0",
     "vite-plugin-mock": "^2.9.4",
     "vue": "^3.2.40",
     "vue-baidu-map": "^0.21.22",

src/components/edittablehead/index.vue

@@ -2,28 +2,17 @@
   <el-drawer :model-value="drawerShow" @close="close" title="编辑列表" size="40%">
     <!-- <el-checkbox  label="12" />
         <el-checkbox  label="2" /> -->
-    <el-table :data="columnList" style="width: 100%; height: 700px" border>
+    <el-table :data="columnList" style="width: 100%; height: 700px" border ref="tableEl1">
-      <el-table-column
+      <el-table-column v-for="column in headtop" :key="column.prop" :prop="column.prop" :label="column.label"
-        v-for="column in headtop"
+        :width="column.width" flexible>
-        :key="column.prop"
-        :prop="column.prop"
-        :label="column.label"
-        :width="column.width"
-        flexible
-      >
         <template #header>
           <el-text class="mx-1">{{ column.label }}</el-text>
         </template>
         <template #default="scope">
           <el-text class="mx-1" v-if="column.prop == 'label'">{{ scope.row[column.prop] }}</el-text>
           <el-checkbox-group v-else-if="column.label == '隐藏'" v-model="checkList">
-            <el-checkbox
+            <el-checkbox :key="scope.row['label']" :label="scope.row['label']" true-label="" false-label=""
-              :key="scope.row['label']"
+              @change="checkboxitem(1)">
-              :label="scope.row['label']"
-              true-label=""
-              false-label=""
-              @change="checkboxitem(1)"
-            >
               <!-- 用于隐藏文字 -->
               <template #default="scope">
                 <!-- {{ scope }} -->
@@ -31,13 +20,8 @@
             </el-checkbox>
           </el-checkbox-group>
           <el-checkbox-group v-else-if="column.label == '冻结'" v-model="flexList">
-            <el-checkbox
+            <el-checkbox :key="scope.row['label']" :label="scope.row['label']" true-label="" false-label=""
-              :key="scope.row['label']"
+              @change="checkboxitem(2)">
-              :label="scope.row['label']"
-              true-label=""
-              false-label=""
-              @change="checkboxitem(2)"
-            >
               <!-- 用于隐藏文字 -->
               <template #default="scope">
                 <!-- {{ scope }} -->
@@ -45,13 +29,8 @@
             </el-checkbox>
           </el-checkbox-group>
           <el-checkbox-group v-else-if="column.label == '排序'" v-model="sortlist">
-            <el-checkbox
+            <el-checkbox :key="scope.row['label']" :label="scope.row['label']" true-label="" false-label=""
-              :key="scope.row['label']"
+              @change="checkboxitem(3)">
-              :label="scope.row['label']"
-              true-label=""
-              false-label=""
-              @change="checkboxitem(3)"
-            >
               <!-- 用于隐藏文字 -->
               <template #default="scope">
                 <!-- {{ scope }} -->
@@ -67,9 +46,10 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, watchEffect, onMounted, watch, inject } from 'vue';
+import { ref, watchEffect, onMounted, watch, inject, nextTick } from 'vue';
 import type { PropType } from 'vue';
 const functions = inject('functions') as any;
+import Sortable from "sortablejs";
 interface TableColumnType {
   /** 表格列的key */
   prop: string;
@@ -122,6 +102,9 @@ interface headtoptype {
 const checkList = ref<(string | number)[]>([]);
 const flexList = ref<(string | number)[]>([]);
 const sortlist = ref<(string | number)[]>([]);
+const tableEl1 = ref(null);
+
+
 if (functions.getStorage(window.location.pathname + 'checkList')) {
   checkList.value = functions.getStorage(window.location.pathname + 'checkList');
   console.log(checkList.value);
@@ -145,6 +128,47 @@ let props = defineProps({
     required: true,
   },
 });
+
+onMounted(() => {
+  nextTick(() => {
+    console.log('onMounted')
+    initSortable();
+  });
+})
+
+
+watch(
+  () => props.drawerShow,
+  (val) => {
+    if (val)
+      nextTick(() => {
+        initSortable();
+        console.log('watch')
+      });
+  }
+);
+
+const initSortable = () => {
+  if (tableEl1.value && tableEl1.value.$el) {
+    const el1 = tableEl1.value.$el.querySelector('.el-table__body tbody')
+    console.log(el1)
+    Sortable.create(el1, {
+      // handle: '.move-icon',
+      animation: 150, // 动画
+      onEnd: ({ newIndex, oldIndex }) => {
+        console.log(newIndex, oldIndex)
+        const arr = props.columnList
+        const currRow = arr.splice(oldIndex, 1)[0]
+        arr.splice(newIndex, 0, currRow)
+        // nextTick(() => {
+        //   emit('setcolum', arr, 4);
+        // })
+      }
+    })
+  }
+
+}
+
 function close() {
   emit('closce', false);
 }
@@ -184,13 +208,7 @@ function close() {
 //   });
 //   emit('setcolum', props.columnList);
 // });
-// onMounted(() => {
+
-//   props.columnList.map(item => {
-//     if (item.head) {
-//       (checkList.value as string[]).push(item.label);
-//     }
-//   });
-// });
 // watchEffect(()=>{
 //     props.columnList.map(item => {
 //         if(item.head){

src/page/index/index.vue

@@ -15,9 +15,9 @@
         <!-- 主体视图层 -->
         <div id="avue-view" v-show="!isSearch" v-if="isRefresh">
           <router-view #="{ Component }">
-            <keep-alive :include="$store.getters.tagsKeep">
+            <!-- <keep-alive :include="$store.getters.tagsKeep"> -->
               <component :is="Component" />
-            </keep-alive>
+            <!-- </keep-alive> -->
           </router-view>
         </div>
       </div>

src/page/index/layout.vue

@@ -1,7 +1,7 @@
 <template>
   <router-view #="{ Component }">
-    <keep-alive :include="$store.getters.tagsKeep">
+    <!-- <keep-alive :include="$store.getters.tagsKeep"> -->
       <component :is="Component" />
-    </keep-alive>
+    <!-- </keep-alive> -->
   </router-view>
 </template>

src/router/avue-router.js

@@ -54,9 +54,11 @@ RouterPlugin.install = function (option = {}) {
           children = oMenu[propsDefault.children],
           query = oMenu[propsDefault.query],
           meta = oMenu[propsDefault.meta];
+
         if (option.keepAlive) {
           meta.keepAlive = option.keepAlive;
         }
+
         const isChild = !!(children && children.length !== 0);
         const oRouter = {
           path: path,

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -14,16 +14,8 @@
             </el-form-item>
             <el-form-item label="入库时间:" class="el-times">
               <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
-              <el-date-picker
+              <el-date-picker v-model="stockupDate" type="datetimerange" unlink-panels range-separator="至"
-                v-model="stockupDate"
+                start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" :default-time="defaultTime2" />
-                type="datetimerange"
-                unlink-panels
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                :shortcuts="shortcuts"
-                :default-time="defaultTime2"
-              />
             </el-form-item>
             <!--          <el-form-item label="货物名称:">-->
             <!--            <el-input v-model="query.descriptionGoods" placeholder="请输入货物名称"></el-input>-->
@@ -75,28 +67,14 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler"
+            <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="handler">创建异常</el-button>
-              >创建异常</el-button
-            >
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>-->
             <!--            <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>-->
-            <el-button
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('3')"
-              type="danger"
+              v-if="handler">修改客户信息</el-button>
-              icon="el-icon-delete"
+            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('2')"
-              @click="handleCallDelivery('3')"
+              v-if="handler">修改服务类型</el-button>
-              v-if="handler"
+            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain>导 出</el-button>
-              >修改客户信息</el-button
-            >
-            <el-button
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleCallDelivery('2')"
-              v-if="handler"
-              >修改服务类型</el-button
-            >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
-              >导 出</el-button
-            >
           </div>
           <!--   <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handlebill"  v-if = "!handler">创建提货单</el-button>
@@ -113,27 +91,12 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <tablecmt
+        <tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc" @timeCheck="timesc"
-          :columnList="columnList"
+          @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionChange">
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
           <template #default="slotProps">
-            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)"
+            <el-text type="primary" text icon="el-icon-view" @click="handleView(slotProps.scope)">查看</el-text>
-              >查看</el-text
+            <el-text type="primary" text icon="el-icon-edit"
-            >
+              @click="handleCallDeliveryOwn(slotProps.scope)">修改客户信息</el-text>
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleCallDeliveryOwn(slotProps.scope)"
-              >修改客户信息</el-text
-            >
           </template>
         </tablecmt>
       </el-row>
@@ -141,17 +104,9 @@
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
-          <el-pagination
+          <el-pagination align="right" background @size-change="sizeChange" @current-change="currentChange"
-            align="right"
+            :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]" :page-size="page.pageSize"
-            background
+            layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
           </el-pagination>
         </div>
       </el-row>
@@ -167,12 +122,7 @@
             <el-input v-model="formCall.waybill" autocomplete="off" />
           </el-form-item>
           <el-form-item label="跟进记录" :label-width="formLabelWidth">
-            <el-input
+            <el-input v-model="formCall.followUpRecord" :rows="2" type="textarea" placeholder="请填写内容" />
-              v-model="formCall.followUpRecord"
-              :rows="2"
-              type="textarea"
-              placeholder="请填写内容"
-            />
           </el-form-item>
           <el-form-item label="历史跟进" :label-width="formLabelWidth"> </el-form-item>
         </el-form>
@@ -189,12 +139,8 @@
           <el-form-item label="服务类型" :label-width="formLabelWidth">
             <!--            <el-input v-model="formService.typeService" autocomplete="off" />-->
             <el-select v-model="formService.typeService" clearable placeholder="请选择服务类型">
-              <el-option
+              <el-option v-for="item in distributionType" :key="item.dictKey" :label="item.dictValue"
-                v-for="item in distributionType"
+                :value="item.dictKey">
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
-              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -202,12 +148,7 @@
             <el-input v-model="formService.cost" autocomplete="off" />
           </el-form-item>
           <el-form-item label="原因" :label-width="formLabelWidth">
-            <el-input
+            <el-input v-model="formService.cause" :rows="2" type="textarea" placeholder="请填写原因" />
-              v-model="formService.cause"
-              :rows="2"
-              type="textarea"
-              placeholder="请填写原因"
-            />
           </el-form-item>
         </el-form>
         <template #footer>
@@ -227,12 +168,7 @@
             <el-input v-model="formCustomer.phone" autocomplete="off" />
           </el-form-item>
           <el-form-item label="地址" :label-width="formLabelWidth">
-            <el-input
+            <el-input v-model="formCustomer.address" :rows="2" type="textarea" placeholder="请填写地址" />
-              v-model="formCustomer.address"
-              :rows="2"
-              type="textarea"
-              placeholder="请填写地址"
-            />
           </el-form-item>
         </el-form>
         <template #footer>
@@ -244,13 +180,7 @@
         </template>
       </el-dialog>
       <!-- 表单模块 -->
-      <el-dialog
+      <el-dialog :title="title" v-model="box" width="50%" :before-close="beforeClose" append-to-body>
-        :title="title"
-        v-model="box"
-        width="50%"
-        :before-close="beforeClose"
-        append-to-body
-      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
           <el-form-item label="服务号" prop="serviceNumber">
@@ -270,13 +200,8 @@
           </el-form-item>
           <el-form-item label="入库时间" prop="warehouseEntryTime">
             <!--            <el-input v-model="form.warehouseEntryTime" placeholder="请输入入库时间"/>-->
-            <el-date-picker
+            <el-date-picker v-model="form.warehouseEntryTime" type="datetime" placeholder="请输入入库时间"
-              v-model="form.warehouseEntryTime"
+              format="YYYY-MM-DD hh:mm:ss" value-format="YYYY-MM-DD hh:mm:ss" />
-              type="datetime"
-              placeholder="请输入入库时间"
-              format="YYYY-MM-DD hh:mm:ss"
-              value-format="YYYY-MM-DD hh:mm:ss"
-            />
           </el-form-item>
           <el-form-item label="在库时长" prop="storeTime">
             <el-input v-model="form.storeTime" placeholder="请输入在库时长" />
@@ -352,21 +277,15 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
-              >提 交</el-button
-            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
       </el-dialog>
     </div>
   </basic-container>
-  <edittablehead
+  <edittablehead @setcolum="setnewcolum" @closce="showdrawer" :drawerShow="drawerShow" :columnList="columnList">
-    @setcolum="setnewcolum"
+  </edittablehead>
-    @closce="showdrawer"
-    :drawerShow="drawerShow"
-    :columnList="columnList"
-  ></edittablehead>
 </template>
 
 <script>
@@ -1590,23 +1509,29 @@ export default {
 .el-button--text {
   margin-right: 15px;
 }
+
 .el-select {
   width: 300px;
 }
+
 .el-input {
   width: 300px;
 }
+
 .dialog-footer button:first-child {
   margin-right: 10px;
 }
+
 .el-fr {
   width: 100%;
   display: flex;
   justify-content: space-between;
+
   .asterisk-left:last-child {
     margin-right: 0;
   }
 }
+
 .el-input {
   margin-left: 8px;
 }
@@ -1614,28 +1539,35 @@ export default {
 :deep(.el-form-item__content) {
   margin-left: 8px;
 }
+
 .el-times {
   width: auto;
+
   :deep(.el-tooltip__trigger) {
     height: 30px !important;
   }
 }
+
 :deep(.el-form-item__label) {
   padding: 0;
 }
+
 :deep(.avue-crud) {
   display: flex;
   height: 100%;
   flex-direction: column;
 }
+
 :deep(.el-card__body) {
   height: 100%;
 }
+
 :deep(.el-card) {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
+
 .el-fy {
   flex: 1;
   display: flex;

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -10,15 +10,8 @@
             </el-form-item>
             <el-form-item label="入库时间:" class="el-times">
               <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
-              <el-date-picker
+              <el-date-picker v-model="stockupDate" type="datetimerange" unlink-panels range-separator="至"
-                v-model="stockupDate"
+                start-placeholder="开始时间" end-placeholder="结束时间" :shortcuts="shortcuts" />
-                type="datetimerange"
-                unlink-panels
-                range-separator="至"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                :shortcuts="shortcuts"
-              />
             </el-form-item>
           </div>
           <!-- 查询按钮 -->
@@ -36,8 +29,7 @@
         </el-col>
         <el-col :span="10">
           <span style="margin-bottom: 2%; font-size: 16px">
-            已提货：{{ stopNum }}单/{{ numBill }}件</span
+            已提货：{{ stopNum }}单/{{ numBill }}件</span>
-          >
         </el-col>
       </el-row>
       <el-row>
@@ -46,14 +38,12 @@
           <div class="avue-crud__left">
             <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd"
+            <el-button type="primary" icon="el-icon-plus" v-if="permission.distrilbutionBillLadingList_add"
-              >创建自提</el-button
+              @click="handleBillAdd">创建自提</el-button>
-            >
+            <el-button type="primary" icon="el-icon-plus" v-if="permission.distrilbutionBillLadingList_sign"
-            <el-button type="primary" icon="el-icon-plus" @click="handleSign(null, 2)"
+              @click="handleSign(null, 2)">自提签收</el-button>
-              >自提签收</el-button
+            <el-button type="danger" icon="el-icon-delete" v-if="permission.distrilbutionBillLadingList_export"
-            >
+              @click="handleExportInfo" plain>导出
-            <el-button type="danger" icon="el-icon-delete" @click="handleExportInfo" plain
-              >导出
             </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -66,36 +56,16 @@
       </el-row>
       <el-row>
         <!-- 列表模块 -->
-        <tablecmt
+        <tablecmt :columnList="columnList" :tableData="data" :loading="loading" @inputTxt="inputsc" @timeCheck="timesc"
-          :columnList="columnList"
+          @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionChange">
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionChange"
-        >
           <template #default="slotProps">
             <!--            <el-button size="small" @click="editsolt(slotProps.scope)">修改</el-button>-->
-            <el-text size="small" text @click="handleLike(slotProps.scope)">查看</el-text>
+            <el-text size="small" text v-if="permission.distrilbutionBillLadingList_view"
-            <el-text
+              @click="handleLike(slotProps.scope)">查看</el-text>
-              size="small"
+            <el-text size="small" type="danger" icon="el-icon-edit" text @click="handleSign(slotProps.scope, 1)"
-              type="danger"
+              v-if="permission.distrilbutionBillLadingList_qs && slotProps.scope.row.conditions < 30">签收</el-text>
-              icon="el-icon-edit"
+            <el-text type="primary" text icon="el-icon-edit" @click="handleEdits(slotProps.scope)"
-              text
+              v-if="permission.distrilbutionBillLadingList_edit && slotProps.scope.row.conditions < 20">编辑提货信息</el-text>
-              @click="handleSign(slotProps.scope, 1)"
-              v-if="slotProps.scope.row.conditions < 30"
-              >签收</el-text
-            >
-            <el-text
-              type="primary"
-              text
-              icon="el-icon-edit"
-              @click="handleEdits(slotProps.scope)"
-              v-if="slotProps.scope.row.conditions < 20"
-              >编辑提货信息</el-text
-            >
             <!--            <el-button size="small" type="danger" icon="el-icon-edit" text @click="handleDeleteOwn(slotProps.scope)">删除</el-button>-->
           </template>
         </tablecmt>
@@ -104,28 +74,14 @@
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
-          <el-pagination
+          <el-pagination align="right" background @size-change="sizeChange" @current-change="currentChange"
-            align="right"
+            :current-page="page.currentPage" :page-sizes="[30, 50, 80, 120]" :page-size="page.pageSize"
-            background
+            layout="total, sizes, prev, pager, next, jumper" :total="page.total">
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
           </el-pagination>
         </div>
       </el-row>
       <!-- 表单模块 -->
-      <el-dialog
+      <el-dialog :title="title" v-model="box" width="50%" :before-close="beforeClose" append-to-body>
-        :title="title"
-        v-model="box"
-        width="50%"
-        :before-close="beforeClose"
-        append-to-body
-      >
         <el-form :disabled="view" ref="form" :model="form" label-width="80px">
           <!-- 表单字段 -->
           <el-form-item label="提货时间" prop="pickUpTime">
@@ -142,12 +98,8 @@
           </el-form-item>
           <el-form-item label="证件类型" prop="certificateType">
             <el-select v-model="form.certificateType" clearable placeholder="请选择证件类型">
-              <el-option
+              <el-option v-for="item in certificateTypeData" :key="item.dictKey" :label="item.dictValue"
-                v-for="item in certificateTypeData"
+                :value="item.dictKey">
-                :key="item.dictKey"
-                :label="item.dictValue"
-                :value="item.dictKey"
-              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -158,9 +110,7 @@
         <!-- 表单按钮 -->
         <template #footer>
           <span v-if="!view" class="dialog-footer">
-            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit"
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
-              >提 交</el-button
-            >
             <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
           </span>
         </template>
@@ -318,12 +268,8 @@
       </div>
     </div>-->
   </basic-container>
-  <edittablehead
+  <edittablehead @setcolum="setnewcolum" @closce="showdrawer" :drawerShow="drawerShow" :columnList="columnList">
-    @setcolum="setnewcolum"
+  </edittablehead>
-    @closce="showdrawer"
-    :drawerShow="drawerShow"
-    :columnList="columnList"
-  ></edittablehead>
 </template>
 
 <script>
@@ -774,6 +720,8 @@ export default {
       } else if (type == 3) {
         this.columnList = newarr;
         this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
+      } else if (type == 4) {
+        this.columnList = newarr;
       }
     },
     selectionsc(value) {
@@ -1161,10 +1109,12 @@ export default {
   z-index: 999;
   height: 60px;
 }
+
 .foot .dialog-footer {
   margin-bottom: 130px;
   text-align: center;
 }
+
 .ca .el-radio__inner {
   top: -18px;
   left: -19px;
@@ -1187,23 +1137,28 @@ export default {
 .el-input {
   margin-left: 8px;
 }
+
 :deep(.el-form-item__content) {
   margin-left: 8px;
 }
+
 .el-fr-d {
   width: 100%;
   display: flex;
   justify-content: space-between;
 }
+
 .el-btn {
   margin-right: 0;
 }
+
 // 日期选择框
 .el-times {
   :deep(.el-tooltip__trigger) {
     height: 30px !important;
   }
 }
+
 :deep(.el-form-item__label) {
   padding: 0;
 }
@@ -1215,14 +1170,17 @@ export default {
   height: 100%;
   flex-direction: column;
 }
+
 :deep(.el-card__body) {
   height: 100%;
 }
+
 :deep(.el-card) {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
+
 .el-fy {
   flex: 1;
   display: flex;

src/views/factory/snm/staorderPackages.vue

@@ -1,24 +1,10 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
+    <avue-crud :option="option" v-model:search="search" v-model:page="page" v-model="form" :table-loading="loading"
-               v-model:search="search"
+      :data="data" :permission="permissionList" :before-open="beforeOpen" ref="crud" @row-update="rowUpdate"
-               v-model:page="page"
+      @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-               v-model="form"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-               :table-loading="loading"
+      @refresh-change="refreshChange" @on-load="onLoad">
-               :data="data"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
       <template #menu-left>
         <!--        <el-button type="danger"-->
         <!--                   icon="el-icon-delete"-->
@@ -26,8 +12,7 @@
         <!--                   v-if="permission.staorderPackages_delete"-->
         <!--                   @click="handleDelete">删 除-->
         <!--        </el-button>-->
-        <el-button type="primary"
+        <el-button type="primary" @click="handleVie">返 回
-                   @click="handleVie">返 回
         </el-button>
       </template>
     </avue-crud>
@@ -246,5 +231,4 @@
 };
 </script>
 
-<style>
+<style></style>
-</style>

src/views/factory/snm/stationlinenum.vue

@@ -1,24 +1,10 @@
 <template>
   <basic-container>
-    <avue-crud :option="option"
+    <avue-crud :option="option" v-model:search="search" v-model:page="page" v-model="form" :table-loading="loading"
-               v-model:search="search"
+      :data="data" :permission="permissionList" :before-open="beforeOpen" ref="crud" @row-update="rowUpdate"
-               v-model:page="page"
+      @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-               v-model="form"
+      @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-               :table-loading="loading"
+      @refresh-change="refreshChange" @on-load="onLoad">
-               :data="data"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
       <template #id-header="{ column }">
         <span>{{ column.label }}</span>
         <el-input size="autosize" v-model="query.id" placeholder="请输入内容" suffix-icon="el-icon-search" />
@@ -38,16 +24,10 @@
       </template>
 
       <template #menu-left>
-        <el-button type="danger"
+        <el-button type="danger" icon="el-icon-delete" plain v-if="permission.stationlinenum_delete"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.stationlinenum_delete"
           @click="handleDelete">删 除
         </el-button>
-        <el-button type="warning"
+        <el-button type="warning" plain icon="el-icon-download" @click="handleExport">导 出
-                   plain
-                   icon="el-icon-download"
-                   @click="handleExport">导 出
         </el-button>
       </template>
 
@@ -253,13 +233,16 @@
 <style scoped lang='scss'>
 :deep(.no-print) {
   margin-left: auto;
+
   .el-button {
     margin-right: 0
   }
 }
+
 :deep(.avue-form__row) {
   max-width: 300px !important;
 }
+
 :deep(.el-form-item__label) {
   width: auto !important;
 }