修改 打印机设置页面

resources/views/maintenance/expressPrinting/setting/printer/_create.blade.php

@@ -1,5 +1,5 @@
 <div class="modal " id="create-printer" tabindex="-1">
-    <div class="modal-dialog modal-lg modal-dialog-centered">
+    <div class="modal-dialog modal-xl">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title text-center">终端-打印机添加</h5>
@@ -12,7 +12,8 @@
                     <div class="form-group row">
                         <label for="create_printer_terminal_id" class="col-sm-3 col-form-label text-right">所属终端</label>
                         <div class="col-sm-9 form-inline">
-                            <select name="printer_terminal_id" id="create_printer_terminal_id" class="form-control col-sm-5" v-model="printer.terminal_id">
+                            <select name="printer_terminal_id" id="create_printer_terminal_id"
+                                    class="form-control col-sm-5" v-model="printer.terminal_id">
                                 <option value=""></option>
                                 <template v-for="terminal in filterTerminals">
                                     <option :value="terminal.id">
@@ -21,7 +22,8 @@
                                 </template>
                             </select>
                             <label class="col-sm-2 offset-sm-1">
-                                <input type="text" class="form-control offset-sm-1"  v-model="terminalFilter" placeholder="终端筛选">
+                                <input type="text" class="form-control offset-sm-1" v-model="terminalFilter"
+                                       placeholder="终端筛选">
                             </label>
                             <div class="invalid-feedback" v-if="printerErrors.terminal_id">
                                 @{{ printerErrors.terminal_id[0] }}
@@ -30,9 +32,11 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="create_printer_printer_name" class="col-sm-3 col-form-label text-right">打印机名称</label>
+                        <label for="create_printer_printer_name"
+                               class="col-sm-3 col-form-label text-right">打印机名称</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="text" id="create_printer_printer_name" class="form-control col-9" v-model="printer.printer_name"
+                            <input type="text" id="create_printer_printer_name" class="form-control col-9"
+                                   v-model="printer.printer_name"
                                    placeholder="打印机名称"
                                    :class="printerErrors.printer_name?'is-invalid':''"
                                    @focus="printerErrors.printer_name= null">
@@ -45,7 +49,8 @@
                     <div class="form-group row">
                         <label for="create_printer_alias_name" class="col-sm-3 col-form-label text-right">名称</label>
                         <div class="col-sm-9 form-inline">
-                            <input type="text" id="create_printer_alias_name" class="form-control col-9" v-model="printer.alias_name"
+                            <input type="text" id="create_printer_alias_name" class="form-control col-9"
+                                   v-model="printer.alias_name"
                                    placeholder="名称"
                                    :class="printerErrors.alias_name?'is-invalid':''"
                                    @focus="printerErrors.alias_name= null">
@@ -56,19 +61,38 @@
                     </div>
 
                     <div class="form-group row">
-                        <label for="create_printer_print_type" class="col-sm-3 col-form-label text-right">打印机类型</label>
+                        <label for="create_printer_print_type" class="col-sm-3 col-form-label text-right">关联</label>
                         <div class="col-sm-9 form-inline">
-                            <label for="create_printer_print_type">
-                                <select name="print_type" id="create_printer_print_type" class="form-control" v-model="printer.print_type">
-                                    <option value=""></option>
-                                    <template v-for="type in types">
-                                        <option :value="type.value">
-                                            <span v-text="type.value"></span>
-                                        </option>
-                                    </template>
-                                </select>
-                            </label>
-
+                            <div class="col-9 form-inline">
+                                <div class="card col-6 p-0">
+                                    <div class="card-header">
+                                        <input class="form-control" type="text" placeholder="筛选" v-model="filter['logistic']">
+                                    </div>
+                                    <div class="card-body overflow-scrollbar-200 p-0 m-0" style="max-height: 300px">
+                                        <ul class="list-group">
+                                            <template v-for="logistic in logistics">
+                                                <li class="list-group-item"  @dblclick="addToLogistics(logistic)" v-if="includeLogistics(logistic)">
+                                                    @{{ logistic.name }}
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                </div>
+                                <div class="card col-6 p-0">
+                                    <div class="card-header" style="max-height: 300px">
+                                        <input class="form-control" type="text" placeholder="筛选" v-model="filter['printer_logistic']">
+                                    </div>
+                                    <div class="card-body overflow-scrollbar-200 p-0 m-0" style="max-height: 300px">
+                                        <ul class="list-group">
+                                            <template v-for="logistic in logistics">
+                                                <li class="list-group-item"  @dblclick="removeToLogistics(logistic)" v-if="includePrintLogistic(logistic)">
+                                                    @{{ logistic.name }}
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="invalid-feedback" v-if="printerErrors.print_type">
                                 @{{ printerErrors.print_type[0] }}
                             </div>

resources/views/maintenance/expressPrinting/setting/printer/_edit.blade.php

@@ -58,17 +58,36 @@
                     <div class="form-group row">
                         <label for="edit_printer_print_type" class="col-sm-3 col-form-label text-right">打印机类型</label>
                         <div class="col-sm-9 form-inline">
-                            <label for="edit_printer_print_type">
-                                <select name="print_type" id="edit_printer_print_type" class="form-control" v-model="printer.print_type">
-                                    <option value=""></option>
-                                    <template v-for="type in types">
-                                        <option :value="type.value">
-                                            <span v-text="type.value"></span>
-                                        </option>
-                                    </template>
-                                </select>
-                            </label>
-
+                           <div class="col-9 form-inline">
+                                <div class="card col-6 p-0">
+                                    <div class="card-header">
+                                        <input class="form-control" type="text" placeholder="筛选" v-model="filter['logistic']">
+                                    </div>
+                                    <div class="card-body overflow-scrollbar-200 p-0 m-0" style="max-height: 300px">
+                                        <ul class="list-group">
+                                            <template v-for="logistic in logistics">
+                                                <li class="list-group-item"  @dblclick="addToLogistics(logistic)" v-if="includeLogistics(logistic)">
+                                                    @{{ logistic.name }}
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                </div>
+                                <div class="card col-6 p-0">
+                                    <div class="card-header" style="max-height: 300px">
+                                        <input class="form-control" type="text" placeholder="筛选" v-model="filter['printer_logistic']">
+                                    </div>
+                                    <div class="card-body overflow-scrollbar-200 p-0 m-0" style="max-height: 300px">
+                                        <ul class="list-group">
+                                            <template v-for="logistic in logistics">
+                                                <li class="list-group-item"  @dblclick="removeToLogistics(logistic)" v-if="includePrintLogistic(logistic)">
+                                                    @{{ logistic.name }}
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="invalid-feedback" v-if="printerErrors.print_type">
                                 @{{ printerErrors.print_type[0] }}
                             </div>

resources/views/maintenance/expressPrinting/setting/printer/_table.blade.php

@@ -5,7 +5,6 @@
         <td>打印机名</td>
         <td>名称</td>
         <td>终端名称</td>
-        <td>打印机类型</td>
         <td>操作</td>
     </tr>
     </thead>
@@ -16,7 +15,6 @@
         <td>@{{ printer.printer_name }}</td>
         <td>@{{ printer.alias_name }}</td>
         <td>@{{ printer.terminal ? printer.terminal.name : '' }}</td>
-        <td>@{{ printer.print_type}}</td>
         <td>
             <button class="btn btn-sm btn-primary" @click="showEditModel(printer,i)">编辑</button>
             <button class="btn btn-sm btn-danger " style="opacity: 0.9" @click="destroyPrinter(printer,i)">删除</button>