feat: 合并nl-admin，新增生箔、烘箱业务

lms2/nladmin-ui/src/views/lucene/index.vue

@@ -62,6 +62,15 @@
             :end-placeholder="$t('Log.end_time')"
           />
         </el-form-item>
+        <el-form-item label="压缩查看" prop="isRequest">
+          <el-switch
+            v-model="compressedView"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            :active-value="true"
+            :inactive-valu="false"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="mini" @click="queryData">
             {{ $t('common.Query') }}
@@ -73,7 +82,8 @@
     <el-card shadow="hover" style="width: 100%" class="log-warpper">
       <div style="width: 100%">
         <div v-for="(log, index) in logs" :key="index">
-          <div style="margin-bottom: 5px; font-size: 14px;" v-html="log" />
+          <div v-if="compressedView === false" style="margin: 5px;font-size: 16px; word-break: break-all; white-space: pre-wrap;" v-html="log" />
+          <div v-else style="margin-bottom: 5px; font-size: 16px;" v-html="log" />
         </div>
       </div>
     </el-card>
@@ -126,7 +136,8 @@ export default {
         size: 100,
         total: 0,
         createTime: ''
-      }
+      },
+      compressedView: true
     }
   },
   created() {

lms2/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -471,7 +471,6 @@ import PointDialog from '@/views/wms/sch/point/PointDialog.vue'
 import i18n from '@/i18n'
 
 const defaultForm = {
-  point_id: null,
   point_code: null,
   point_name: null,
   region_code: null,
@@ -510,8 +509,8 @@ export default {
     return CRUD({
       title: i18n.t('Point.title'),
       url: 'api/schBasePoint',
-      idField: 'point_id',
-      sort: 'point_id,desc',
+      idField: 'point_code',
+      sort: 'point_code,desc',
       crudMethod: { ...crudSchBasePoint },
       optShow: {
         add: true,

lms2/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -458,7 +458,11 @@ export default {
         download: false,
         reset: true
       },
-      crudMethod: { ...crudSchBaseTask }
+      crudMethod: { ...crudSchBaseTask },
+      query: {
+        more_task_status: '09',
+        task_status: ['09']
+      }
     })
   },
   data() {
@@ -480,7 +484,6 @@ export default {
       this.crud.toQuery()
     },
     handTaskStatus(value) {
-      this.crud.query.more_task_status = null
       if (value) {
         this.crud.query.more_task_status = value.toString()
       }