代码修改

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AutoCleanUpLogs.java

@@ -0,0 +1,42 @@
+package org.nl.wms.sch.tasks;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.wql.core.bean.WQLObject;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+
+/**
+ * @author geng by
+ * 自动清理大于十五天的日志
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AutoCleanUpLogs {
+
+    private ExecutorService threadPool = Executors.newCachedThreadPool();
+
+    public void run() throws Exception {
+        try {
+            System.out.println("开始清理日志");
+            // 0 0/10 0,1 * * ? *  每天0-1点执行间隔10分钟一次
+            //sys_log
+            //delete from  sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10;
+            WQLObject logTab = WQLObject.getWQLObject("sys_log");
+            String days = WQLObject.getWQLObject("sys_param").query("code='clean_day'").uniqueResult(0).getString("value");
+            logTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL '" + days + "' day))");
+            log.info("自动清理日志执行成功...!");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}

wms/qd/src/views/wms/md/material/index.vue

@@ -3,17 +3,27 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="请输入物料编码或者物料名称"
+          label-suffix=":"
-          style="width: 250px;"
+        >
-          class="filter-item"
+          <el-form-item label="物料编码">
-          @keyup.enter.native="crud.toQuery"
+            <!-- 搜索 -->
-        />
+            <el-input
-        <rrOperation />
+              v-model="query.name"
+              clearable
+              size="small"
+              placeholder="请输入物料编码或者物料名称"
+              style="width: 250px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />

wms/qd/src/views/wms/md/materiallabel/index.vue

@@ -3,17 +3,27 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.bullery"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="请输入配方或批次"
+          label-suffix=":"
-          style="width: 250px;"
+        >
-          class="filter-item"
+          <el-form-item label="配方|批次">
-          @keyup.enter.native="crud.toQuery"
+            <!-- 搜索 -->
-        />
+            <el-input
-        <rrOperation />
+              v-model="query.bullery"
+              clearable
+              size="small"
+              placeholder="请输入配方或批次"
+              style="width: 250px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -96,7 +106,7 @@
         <el-table-column prop="material_spec" label="产品规格" />
         <el-table-column prop="material_code" label="产品编码" />
         <el-table-column prop="material_name" label="产品名称" />
-        <el-table-column prop="label_code" label="最新标签码" width="150" />
+        <el-table-column prop="label_code" label="最新标签码" width="150" show-overflow-tooltip/>
         <el-table-column prop="dtl_count" label="打印次数" />
         <el-table-column prop="stand_hour" label="静置小时" />
         <el-table-column prop="remark" label="备注" />

wms/qd/src/views/wms/pdm/produceTask/index.vue

@@ -3,81 +3,69 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <!--<el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="请输入生产编码或物料名字"
+          label-suffix=":"
-          style="width: 220px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />-->
-        <el-select
-          v-model="query.produce_status"
-          style="width: 120px"
-          placeholder="生产状态"
-          class="filter-item"
-          clearable
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="生产状态">
-            v-for="item in ProduceStatusList"
+            <el-select
-            :key="item.code"
+              v-model="query.produce_status"
-            clearable
+              style="width: 120px"
-            :label="item.name"
+              placeholder="生产状态"
-            :value="item.code"
+              class="filter-item"
-          />
+              clearable
-        </el-select>
+              @change="hand"
-        <el-select
+            >
-          v-model="query.device_code"
+              <el-option
-          style="width: 130px"
+                v-for="item in ProduceStatusList"
-          placeholder="生产设备"
+                :key="item.code"
-          class="filter-item"
+                clearable
-          clearable
+                :label="item.name"
-          @change="hand"
+                :value="item.code"
-        >
+              />
-          <el-option
+            </el-select>
-            v-for="item in deviceList"
+          </el-form-item>
-            :key="item.point_code"
+          <el-form-item label="生产设备">
-            clearable
+            <el-select
-            :label="item.point_name"
+              v-model="query.device_code"
-            :value="item.point_code"
+              style="width: 130px"
-          />
+              placeholder="生产设备"
-        </el-select>
+              class="filter-item"
-        <!--<el-select
+              clearable
-          v-model="query.material_code"
+              @change="hand"
-          style="width: 120px"
+            >
-          placeholder="物料编码"
+              <el-option
-          class="filter-item"
+                v-for="item in deviceList"
-          clearable
+                :key="item.point_code"
-          @change="hand"
+                clearable
-        >-->
+                :label="item.point_name"
-        <el-option
+                :value="item.point_code"
-          v-for="item in materialList"
+              />
-          :key="item.material_code"
+            </el-select>
-          clearable
+          </el-form-item>
-          :label="item.material_code"
+          <el-form-item label="创建类型">
-          :value="item.material_code"
+            <el-select
-        />
+              v-model="query.create_type"
-        </el-select>
+              style="width: 120px"
-        <el-select
+              placeholder="创建类型"
-          v-model="query.create_type"
+              class="filter-item"
-          style="width: 120px"
+              clearable
-          placeholder="创建类型"
+              @change="hand"
-          class="filter-item"
+            >
-          clearable
+              <el-option
-          @change="hand"
+                v-for="item in createTypeList"
-        >
+                :key="item.code"
-          <el-option
+                clearable
-            v-for="item in createTypeList"
+                :label="item.name"
-            :key="item.code"
+                :value="item.code"
-            clearable
+              />
-            :label="item.name"
+            </el-select>
-            :value="item.code"
+          </el-form-item>
-          />
+          <rrOperation />
-        </el-select>
+        </el-form>
-        <rrOperation />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -215,7 +203,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="scope.row.produce_status!=='02'"
+              :disabled="scope.row.produce_status=='02'"
               type="text"
               size="small"
               @click.native.prevent="forceFinish(scope.row)"

wms/qd/src/views/wms/sch/task/index.vue

@@ -144,33 +144,31 @@
         <el-table-column prop="start_area_name" label="起始区域" width="95" />
         <el-table-column prop="start_point_code" label="起点编码" width="85" />
         <el-table-column prop="start_point_name" label="起点名称" width="105" />
-        <el-table-column prop="next_area_name" label="下一区域" width="95" />
+        <el-table-column prop="next_area_name" label="下一区域" width="120" show-overflow-tooltip/>
-        <el-table-column prop="next_point_code" label="下一点编码" width="85" />
+        <el-table-column prop="next_point_code" label="下一点编码" width="120" show-overflow-tooltip/>
         <el-table-column prop="next_point_name" label="下一点名称" width="105" />
         <el-table-column prop="vehicle_code" label="载具编码" />
-        <el-table-column prop="remark" label="备注" width="200" />
+        <el-table-column prop="remark" label="备注" width="200" show-overflow-tooltip/>
         <el-table-column prop="update_by" label="修改者" />
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
           label="操作"
-          width="80px"
+          width="120px"
           align="center"
         >
           <template slot-scope="scope">
-            <el-dropdown trigger="click" @command="handleCommand">
+            <el-button
-              <span class="el-dropdown-link">
+              type="text"
-                <i class="el-icon-menu" />
+              icon="el-icon-circle-check"
-              </span>
+              @click="doOperate(scope.row, 'a')"
-              <el-dropdown-menu slot="dropdown">
+            >完成</el-button>
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
+            <el-button
-                <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
+              type="text"
-                <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
+              icon="el-icon-view"
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">重发</el-dropdown-item>
+              @click="doOperate(scope.row, 'd')"
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>
+            >详情</el-button>
-              </el-dropdown-menu>
-            </el-dropdown>
           </template>
         </el-table-column>
       </el-table>
@@ -312,38 +310,28 @@ export default {
       }
       return ''
     },
-    beforeHandleCommand(index, row, command) {
+    doOperate(row, command) {
-      return {
-        'index': index,
-        'row': row,
-        'command': command
-      }
-    },
-    handleCommand(command) {
       let method_name = ''
-      switch (command.command) {
+      switch (command) {
         case 'a':// 完成
           method_name = 'forceFinish'
           break
         case 'b':// 取消
           method_name = 'cancel'
           break
-        case 'c':// 拉回
+        case 'c':// 下发
-          method_name = 'pullBack'
+          method_name = 'immediateNotifyAcs'
           break
-        case 'd':// 重发
+        case 'd':// 详情
-          method_name = 'renotifyAcs'
-          break
-        case 'e':// 详情
           method_name = 'view'
           break
       }
       if (method_name === 'view') {
-        this.view(command.row)
+        this.view(row)
         return
       }
       const data = {
-        task_uuid: command.row.task_uuid,
+        task_id: row.task_id,
         method_name: method_name
       }
       crudTask.operation(data).then(res => {

wms/qd/src/views/wms/st/core/dumpinv/index.vue

@@ -3,33 +3,44 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="输入仓位编码或名称"
+          label-suffix=":"
-          style="width: 250px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.bill_status"
-          style="width: 120px"
-          placeholder="单据状态"
-          class="filter-item"
-          clearable
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="仓位编码">
-            v-for="item in billStatusList"
+            <el-input
-            :key="item.code"
+              v-model="query.name"
-            clearable
+              clearable
-            :label="item.name"
+              size="small"
-            :value="item.code"
+              placeholder="输入仓位编码或名称"
-          />
+              style="width: 180px;"
-        </el-select>
+              class="filter-item"
-        <rrOperation />
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              style="width: 180px"
+              placeholder="单据状态"
+              class="filter-item"
+              clearable
+              @change="hand"
+            >
+              <el-option
+                v-for="item in billStatusList"
+                :key="item.code"
+                clearable
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation>

wms/qd/src/views/wms/st/core/emptyVehicle/index.vue

@@ -3,33 +3,44 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="输入单据编码"
+          label-suffix=":"
-          style="width: 250px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <el-select
-          v-model="query.bill_status"
-          style="width: 120px"
-          placeholder="单据状态"
-          class="filter-item"
-          clearable
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="单据编码">
-            v-for="item in billStatusList"
+            <el-input
-            :key="item.code"
+              v-model="query.name"
-            clearable
+              clearable
-            :label="item.name"
+              size="small"
-            :value="item.code"
+              placeholder="输入单据编码"
-          />
+              style="width: 250px;"
-        </el-select>
+              class="filter-item"
-        <rrOperation />
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              style="width: 120px"
+              placeholder="单据状态"
+              class="filter-item"
+              clearable
+              @change="hand"
+            >
+              <el-option
+                v-for="item in billStatusList"
+                :key="item.code"
+                clearable
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">

wms/qd/src/views/wms/st/core/inbill/index.vue

@@ -3,32 +3,45 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="输入单据编号搜索"
+          label-suffix=":"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <el-select
-          v-model="query.bill_status"
-          clearable
-          size="small"
-          placeholder="单据状态"
-          class="filter-item"
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="单据编号">
-            v-for="item in dict.st_bill_status"
+            <el-input
-            :label="item.label"
+              v-model="query.name"
-            :value="item.value"
+              clearable
-          />
+              size="small"
-        </el-select>
+              placeholder="输入单据编号搜索"
-        <rrOperation />
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <date-range-picker v-model="query.createTime" class="date-item" />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="small"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.st_bill_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation>

wms/qd/src/views/wms/st/core/outbill/index.vue

@@ -3,32 +3,45 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="输入单据编号搜索"
+          label-suffix=":"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <date-range-picker v-model="query.createTime" class="date-item" />
-        <el-select
-          v-model="query.bill_status"
-          clearable
-          size="small"
-          placeholder="单据状态"
-          class="filter-item"
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="单据编号">
-            v-for="item in dict.st_bill_status"
+            <el-input
-            :label="item.label"
+              v-model="query.name"
-            :value="item.value"
+              clearable
-          />
+              size="small"
-        </el-select>
+              placeholder="输入单据编号搜索"
-        <rrOperation />
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <date-range-picker v-model="query.createTime" class="date-item" />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="small"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.st_bill_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation>

wms/qd/src/views/wms/st/pc/index.vue

@@ -3,32 +3,45 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="输入单据编号搜索"
+          label-suffix=":"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-        <date-range-picker v-model="query.createTime" class="date-item"/>
-        <el-select
-          v-model="query.bill_status"
-          clearable
-          size="small"
-          placeholder="单据状态"
-          class="filter-item"
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="单据编号">
-            v-for="item in dict.st_bill_status"
+            <el-input
-            :label="item.label"
+              v-model="query.name"
-            :value="item.value"
+              clearable
-          />
+              size="small"
-        </el-select>
+              placeholder="输入单据编号搜索"
-        <rrOperation/>
+              style="width: 200px;"
+              class="filter-item"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <date-range-picker v-model="query.createTime" class="date-item"/>
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              clearable
+              size="small"
+              placeholder="单据状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.st_bill_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation/>
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation>
@@ -84,20 +97,25 @@
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
           label="操作"
-          width="80px"
+          width="180px"
           align="center"
         >
           <template slot-scope="scope">
-            <el-dropdown trigger="click" @command="handleCommand">
+            <el-button
-              <span class="el-dropdown-link">
+              type="text"
-                <i class="el-icon-menu"/>
+              icon="el-icon-delete-solid"
-              </span>
+              @click="handleCommand(scope.row, 'a')"
-              <el-dropdown-menu slot="dropdown">
+            >删除</el-button>
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">删除</el-dropdown-item>
+            <el-button
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">搬出</el-dropdown-item>
+              type="text"
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">审核</el-dropdown-item>
+              icon="el-icon-s-promotion"
-              </el-dropdown-menu>
+              @click="handleCommand(scope.row, 'b')"
-            </el-dropdown>
+            >搬出</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-s-claim"
+              @click="handleCommand(scope.row, 'c')"
+            >审核</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -214,13 +232,6 @@ export default {
     })
   },
   methods: {
-    beforeHandleCommand(index, row, command) {
-      return {
-        'index': index,
-        'row': row,
-        'command': command
-      }
-    },
     handleClose(done) {
     },
     saveEvent() {
@@ -237,9 +248,8 @@ export default {
       })
     },
 
-    handleCommand(command) {
+    handleCommand(row, command) {
-      const row = command.row
+      switch (command) {
-      switch (command.command) {
         case 'a':// 删除
           this.opt_delete(row)
           break

wms/qd/src/views/wms/st/quality/index.vue

@@ -3,31 +3,42 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-date-picker
+          :inline="true"
-          v-model="create_time"
+          class="demo-form-inline"
-          type="daterange"
+          label-position="right"
-          start-placeholder="开始日期"
+          label-width="80px"
-          end-placeholder="结束日期"
+          label-suffix=":"
-          @change="selectTime"
-        />
-        <el-select
-          v-model="query.bill_status"
-          style="width: 150px"
-          placeholder="单据状态"
-          class="filter-item"
-          clearable
-          @change="hand"
         >
-          <el-option
+          <el-form-item label="创建时间">
-            v-for="item in billStatusList"
+            <el-date-picker
-            :key="item.code"
+              v-model="create_time"
-            clearable
+              type="daterange"
-            :label="item.name"
+              start-placeholder="开始日期"
-            :value="item.code"
+              end-placeholder="结束日期"
-          />
+              @change="selectTime"
-        </el-select>
+            />
-        <rrOperation />
+          </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select
+              v-model="query.bill_status"
+              style="width: 150px"
+              placeholder="单据状态"
+              class="filter-item"
+              clearable
+              @change="hand"
+            >
+              <el-option
+                v-for="item in billStatusList"
+                :key="item.code"
+                clearable
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -67,26 +78,58 @@
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
-          fixed="left"
+          fixed="right"
           label="操作"
-          width="50px"
+          width="340px"
           align="center"
         >
-          <template slot-scope="scope">
+          <template slot-scope="scope" >
-            <el-dropdown trigger="click" @command="handleCommand">
+            <el-button
-              <span class="el-dropdown-link">
+              type="text"
-                <i class="el-icon-menu" />
+              icon="el-icon-delete-solid"
-              </span>
+              @click="handleCommand(scope.row, 'a')"
-              <el-dropdown-menu slot="dropdown">
+            >删除</el-button>
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">删除</el-dropdown-item>
+            <el-button
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">搬出</el-dropdown-item>
+              type="text"
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">通过</el-dropdown-item>
+              icon="el-icon-s-promotion"
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">不通过</el-dropdown-item>
+              @click="handleCommand(scope.row, 'b')"
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">完成</el-dropdown-item>
+            >搬出</el-button>
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'f')">出库</el-dropdown-item>
+            <el-button
-              </el-dropdown-menu>
+              type="text"
-            </el-dropdown>
+              icon="el-icon-s-claim"
+              @click="handleCommand(scope.row, 'c')"
+            >通过</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-s-release"
+              @click="handleCommand(scope.row, 'd')"
+            >不通过</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-success"
+              @click="handleCommand(scope.row, 'e')"
+            >完成</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-s-home"
+              @click="handleCommand(scope.row, 'f')"
+            >出库</el-button>
           </template>
+<!--          <template slot-scope="scope">-->
+<!--            <el-dropdown trigger="click" @command="handleCommand">-->
+<!--              <span class="el-dropdown-link">-->
+<!--                <i class="el-icon-menu" />-->
+<!--              </span>-->
+<!--              <el-dropdown-menu slot="dropdown">-->
+<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">删除</el-dropdown-item>-->
+<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">搬出</el-dropdown-item>-->
+<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">通过</el-dropdown-item>-->
+<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">不通过</el-dropdown-item>-->
+<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">完成</el-dropdown-item>-->
+<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'f')">出库</el-dropdown-item>-->
+<!--              </el-dropdown-menu>-->
+<!--            </el-dropdown>-->
+<!--          </template>-->
         </el-table-column>
       </el-table>
       <!--分页组件-->
@@ -190,9 +233,8 @@ export default {
         'command': command
       }
     },
-    handleCommand(command) {
+    handleCommand(row, command) {
-      const row = command.row
+      switch (command) {
-      switch (command.command) {
         case 'a':// 删除
           this.opt_delete(row)
           break

wms/qd/src/views/wms/st/struct/index.vue

@@ -3,34 +3,47 @@
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
-        <!-- 搜索 -->
+        <el-form
-        <el-input
+          :inline="true"
-          v-model="query.name"
+          class="demo-form-inline"
-          clearable
+          label-position="right"
-          size="small"
+          label-width="80px"
-          placeholder="输入仓位编码或名称"
+          label-suffix=":"
-          style="width: 250px;"
+        >
-          class="filter-item"
+          <el-form-item label="仓位编码">
-          @keyup.enter.native="crud.toQuery"
+            <el-input
-        />
+              v-model="query.name"
-        <el-cascader
+              clearable
-          v-model="query.sect"
+              size="small"
-          placeholder="库区选择"
+              placeholder="输入仓位编码或名称"
-          clearable
+              style="width: 180px"
-          style="width: 300px"
+              class="filter-item"
-          :options="sectList"
+              @keyup.enter.native="crud.toQuery"
-          class="filter-item"
+            />
-          @change="hand"
+          </el-form-item>
-        />
+          <el-form-item label="选择库区">
-        <el-select v-model="query.active" placeholder="是否启用" class="filter-item" clearable style="width: 100px">
+            <el-cascader
-          <el-option
+              v-model="query.sect"
-            v-for="item in options2"
+              placeholder="库区选择"
-            :key="item.value"
+              clearable
-            :label="item.label"
+              style="width: 180px"
-            :value="item.value"
+              :options="sectList"
-          />
+              class="filter-item"
-        </el-select>
+              @change="hand"
-        <rrOperation />
+            />
+          </el-form-item>
+          <el-form-item label="是否启用">
+            <el-select v-model="query.active" placeholder="是否启用" class="filter-item" clearable style="width: 180px">
+              <el-option
+                v-for="item in options2"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <rrOperation />
+        </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />