speed workshop department

components/page/dataGrid.vue

@@ -53,23 +53,23 @@
         :loading="loading"
       ></Table>
       <div class="table-footer" ref="footer">
-      <div>
-        <slot name="footer"></slot>
-      </div>&nbsp;
-      <Page
-        v-if="page"
-        :total="search.total"
-        :current="search.page"
-        class="mr15 mt15 fr"
-        show-total
-        size="small"
-        show-elevator
-        show-sizer
-        :page-size="search.pageSize"
-        :page-size-opts="pageSizeOpts"
-        @on-change="pageChange"
-        @on-page-size-change="pageSizeChange"
-      />
+        <div>
+          <slot name="footer"></slot>
+        </div>&nbsp;
+        <Page
+          v-if="page"
+          :total="search.total"
+          :current="search.page"
+          class="mr15 mt15 fr"
+          show-total
+          size="small"
+          show-elevator
+          show-sizer
+          :page-size="search.pageSize"
+          :page-size-opts="pageSizeOpts"
+          @on-change="pageChange"
+          @on-page-size-change="pageSizeChange"
+        />
       </div>
     </div>
     <Modal v-if="high" v-model="modalSearch" title="高级搜索" draggable width="800" ref="search">
@@ -130,7 +130,7 @@ export default {
       search: {
         pageIndex: 1,
         pageSize: 20,
-        conditions: [],
+        conditions: []
       },
       pageSizeOpts: [20, 50, 100],
       tableHeight: 0,
@@ -529,9 +529,8 @@ export default {
             });
           };
         }
-        if(u.type=="outputTime")
-        {
-           u.render = (h, params) => {
+        if (u.type == "outputTime") {
+          u.render = (h, params) => {
             let values = u.key;
             return h("OutputTime", {
               props: {

components/page/departmentSelect.vue

 <template>
-<TreeSelect v-model="dep" :data="data" @on-change="change" :disabled="disabled" :multiple="multiple"/>
+<TreeSelect v-model="dep" :data="data" @on-change="change" :disabled="disabled" :multiple="multiple"  :transfer="true"/>
 </template>
 
 <script>

components/page/workShop.vue

@@ -5,6 +5,7 @@
     @on-change="change"
     :multiple="multiple"
     clearable
+    transfer
   >
     <Option v-for="item in dic" :value="item.value" :key="item.value" :label="item.label">
       <div>

pages/order/monitoring/index.vue

@@ -4,10 +4,8 @@
       <template slot="easySearch">
         <Form ref="formInline" :model="easySearch" inline style="margin-top:5px;">
           <FormItem prop="productingpreparationpeople" style="width:200px">
-            <WorkShopSelect
-              ref="userSelected"
-              v-model="easySearch.productingpreparationpeople.value"
-            />
+            <!-- <departmentSelect v-model="easySearch.productingpreparationpeople.value"></departmentSelect>-->
+             <workShop v-model="easySearch.productingpreparationpeople.value"></workShop>
           </FormItem>
           <FormItem prop="keys">
             <Input placeholder="请输入订单编号" v-model="easySearch.keys.value" />
@@ -28,7 +26,7 @@
       <Record :eid="recordId" />
     </Modal>
     <Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM">
-      <Speed :result="result" :load="loading" :executeId="dispatchExecuteId" :orderId="orderId" />
+      <Speed :result="result" :load="loading" @on-close="clsoeSpeedModal" :executeId="dispatchExecuteId" :orderId="orderId" />
     </Modal>
     <Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend">
       <Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120">
@@ -545,7 +543,10 @@ export default {
         }
       });
     },
-
+    clsoeSpeedModal()
+    {
+      this.SpeedModal=false;
+    },
     suspend(row) {
       console.log(row);
       this.suspendModal = true;
@@ -634,4 +635,5 @@ export default {
 .ivu-btn-group {
   height: 21px !important;
 }
+
 </style>
\ No newline at end of file

pages/order/monitoring/speed.vue

@@ -353,6 +353,7 @@ export default {
             .then(res => {
               if (res.success) {
                 this.$Message.success("分卡成功");
+                this.$emit("on-close")
               } else {
                 this.$Message.error("分卡失败");
               }