Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

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

@@ -14,8 +14,8 @@ export default {
       qrcode: true,
       querys: {
         dataType: 1,
-        // itemType: 'raw_material'
+        itemType: 'raw_material',
-        materialType: '原料'
+        materialType: '原料',
       },
       labelType: '2',
       hideType: true

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

@@ -19,32 +19,30 @@
         <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
           style="width: 100%; display: inline-block;" clearable />
       </el-form-item>
-      <el-form-item label="实际库区" prop="actualWarehouseId" v-if="!hideWarehouseQuery">
+
-        <actual-warehouse-select v-model="queryParams.actualWarehouseId" placeholder="请选择实际库位"
+      <el-form-item label="产品名称" prop="productName">
-          style="display: inline-block;" clearable />
+        <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable
-      </el-form-item>
-      <el-form-item label="厂家卷号" prop="supplierCoilNo">
-        <el-input v-model="queryParams.supplierCoilNo" placeholder="请输入厂家原料卷号" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+
-        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
+      <el-form-item label="规格" prop="spec">
-          <el-option v-for="item in dict.type.product_coil_status" :key="item.value" :value="parseInt(item.value)"
+        <el-input v-model="queryParams.spec" placeholder="请输入规格" clearable
-            :label="item.label" />
+          @keyup.enter.native="handleQuery" />
-        </el-select>
+      </el-form-item>
+
+      <el-form-item label="材质" prop="material">
+        <el-input v-model="queryParams.material" placeholder="请输入材质" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="厂家" prop="factory">
+        <el-input v-model="queryParams.factory" placeholder="请输入厂家" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <MaterialSelect :hideType="hideType" :itemId.sync="queryParams.itemIds" :itemType.sync="queryParams.itemType"
         :multiple="true" />
 
-      <el-form-item label="班组" prop="team">
-        <el-input v-model="queryParams.team" placeholder="请输入班组" clearable @keyup.enter.native="handleQuery" />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updateTime">
-        <el-date-picker size="mini" v-model="queryParams.updateTime" type="daterange" value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
-
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -69,7 +67,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" :floatLayer="true" :floatLayerConfig="floatLayerConfig">
+    <KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange" :floatLayer="true"
+      :floatLayerConfig="floatLayerConfig">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
         <template slot-scope="scope">
@@ -137,12 +136,16 @@
           <el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
             导出标签
           </el-button>
-          <el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload" @click="handleExportCoil(scope.row)">
+          <el-button size="mini" v-if="showStatus" type="text" icon="el-icon-upload"
+            @click="handleExportCoil(scope.row)">
             发货
           </el-button>
-          <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload" @click="handleAbnormal(scope.row)">查看异常</el-button>
+          <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)" v-if="showControl">修正</el-button>
+            @click="handleAbnormal(scope.row)">查看异常</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="showControl">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)"
+            v-if="showControl">修正</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-if="showControl">删除</el-button>
           <el-button size="mini" type="text" icon="el-icon-search" @click="handleTrace(scope.row)">追溯</el-button>
         </template>
       </el-table-column>
@@ -507,14 +510,14 @@ export default {
         this.$message.error('保存图片失败，请稍后重试');
       }
     },
-    handleAbnormal (row) {
+    handleAbnormal(row) {
       this.$router.push({
         path: '/quality/detail',
         query: {
           coilId: row.coilId,
         }
       })
-    }, 
+    },
     // 取消按钮
     cancel() {
       this.open = false;

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

@@ -15,11 +15,12 @@ export default {
       querys: {
         dataType: 1,
         materialType: '成品',
+        itemType: 'product',
         status: 0
       },
       labelType: '3',
       showStatus: true,
-      hideType: false,
+      hideType: true,
     }
   }
 }