Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/coil/panels/base.vue

@@ -163,6 +163,43 @@
           </el-select>
         </template>
       </el-table-column>
+
+      <el-table-column label="发货计划" align="center" prop="nextWarehouseId" v-if="showWaybill" width="150">
+        <template slot-scope="scope">
+          {{ scope.row.bindPlanName || '-' }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="发货单据" align="center" prop="nextWarehouseId" v-if="showWaybill" width="150">
+        <template slot-scope="scope">
+          <el-popover placement="top" width="400" trigger="hover">
+            <div>
+              <el-descriptions :column="2" :border="false">
+                <el-descriptions-item label="单据名称">
+                  {{ scope.row.bindWaybillName || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="车牌号">
+                  {{ scope.row.bindLicensePlate || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="收货单位">
+                  {{ scope.row.bindConsigneeUnit || '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负责人">
+                  {{ scope.row.bindPrincipal || '-' }}
+                </el-descriptions-item>
+              </el-descriptions>
+            </div>
+            <div slot="reference" class="text-ellipsis" v-text>{{ scope.row.bindLicensePlate || '-' }}</div>
+          </el-popover>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="发货状态" align="center" prop="status" v-if="showWaybill" width="150">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.status === 1" type="success" size="mini">已发货</el-tag>
+          <el-tag v-else type="info" size="mini">未发货</el-tag>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -445,6 +482,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showWaybill: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {

klp-ui/src/views/wms/coil/waybill.vue

@@ -0,0 +1,33 @@
+<template>
+  <BasePage 
+    :qrcode="qrcode" 
+    :showWaybill="showWaybill"
+    :querys="querys" :labelType="labelType" :showStatus="showStatus" :hideType="hideType" :showControl="showControl" :showExportTime="showExportTime" />
+</template>
+
+<script>
+import BasePage from './panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      querys: {
+        dataType: 1,
+        includeBindInfo: true,
+        // materialType: '成品',
+        // status: 1
+      },
+      showControl: false,
+      labelType: '3',
+      showStatus: false,
+      hideType: false,
+      showExportTime: false,
+      showWaybill: true,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/hrm/dept/index.vue

@@ -87,7 +87,7 @@
         </el-form-item>
         <el-form-item label="部门负责人" prop="leader">
           <!-- <el-input v-model="form.leader" placeholder="请输入部门负责人" /> -->
-          <el-select v-model="form.leader" placeholder="请选择部门负责人">
+          <el-select filterable v-model="form.leader" placeholder="请选择部门负责人">
             <el-option v-for="item in userOptions" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
         </el-form-item>