66

src/styles/transition/common.scss

@@ -313,6 +313,6 @@
 
 .el-input--medium .el-input__inner {
   // height: 32px  !important;
-  line-height: 32px  !important;
+  // line-height: 32px  !important;
 }
 

src/views/produceWord/components/order-search.vue

@@ -91,6 +91,8 @@
             end-placeholder="结束日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
+            :picker-options="pickerOptions"
+         
           >
           </el-date-picker>
         </el-form-item>
@@ -136,7 +138,10 @@ import { getteampage } from  '@/api/produceWord/index.js';
         model: '',
         createTime: [],
         statusList: [4,5,6,7],
-        teamId: ''
+        teamId: '',
+
+
+
       };
       return {
         // 表单数据

src/views/produceWord/index.vue

@@ -20,26 +20,26 @@ r++<template>
 
         <template v-slot:priority="{ row }">
           <div style="display: flex">
-          <el-input
-            v-model="row.priority"
-            type="number"
-            size="mini"
-            :min="0"
-            :max="10"
-            @change="priorityChange(row)"
-            style="width: 80px"
-          ></el-input>
-          <el-popover
-            placement="right"
-            width="200"
-            trigger="hover"
-            content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
-          >
-            <div class="sort-wrap" slot="reference">
-              <i class="el-icon-caret-top" @click="sortTop(row)"></i>
-              <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
-            </div>
-          </el-popover>
+            <el-input
+              v-model="row.priority"
+              type="number"
+              size="mini"
+              :min="0"
+              :max="10"
+              @change="priorityChange(row)"
+              style="width: 80px"
+            ></el-input>
+            <el-popover
+              placement="right"
+              width="200"
+              trigger="hover"
+              content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
+            >
+              <div class="sort-wrap" slot="reference">
+                <i class="el-icon-caret-top" @click="sortTop(row)"></i>
+                <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
+              </div>
+            </el-popover>
           </div>
         </template>
 
@@ -48,6 +48,15 @@ r++<template>
             {{ statusFormatter(row.status) }}
           </span>
         </template>
+
+        <template v-slot:crewNames="{ row }">
+          <span v-if="row.crewNames">
+            {{ row.crewNames }}
+          </span>
+          <span v-if="row.workstationNames ">
+            {{ row.workstationNames }}
+          </span>
+        </template>
       </ele-pro-table>
     </el-card>
 
@@ -122,10 +131,9 @@ r++<template>
             prop: 'batchNo',
             label: '批次号',
             align: 'center',
-            minWidth: 100,
+            minWidth: 100
           },
 
-
           {
             slot: 'code',
             label: '生产订单号',
@@ -163,7 +171,6 @@ r++<template>
             align: 'center'
           },
 
-  
           {
             prop: 'priority',
             label: '优先级',
@@ -214,7 +221,7 @@ r++<template>
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110,
-             sortable: 'custom'
+            sortable: 'custom'
           },
           {
             slot: 'status',
@@ -230,7 +237,17 @@ r++<template>
             prop: 'teamName',
             label: '班组',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            minWidth: 140
+          },
+
+          {
+            prop: 'crewNames',
+            label: '人员/工位',
+            align: 'center',
+            slot: 'crewNames',
+            showOverflowTooltip: true,
+            minWidth: 160
           }
 
           // {
@@ -278,17 +295,14 @@ r++<template>
       onSortChange(e) {
         let sort = {
           orderBy: e.order,
-          sortName:  e.prop,
-        }
-        this.sort = sort
-        this.reload()
-       
+          sortName: e.prop
+        };
+        this.sort = sort;
+        this.reload();
       },
 
-
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
-
           let newRes = res.map((m) => {
             return {
               prop: 'extField.' + m.prop,