5330

src/views/warehouseManagement/statisticalReports/transceiverDetails/add.vue

@@ -58,7 +58,7 @@
                 <el-input
                   :disabled="isView"
                   v-model="formData.keyWord"
-                  placeholder="请输入物品名称/型号/批次号/物品编码/颜色/客户"
+                  placeholder="请输入物品名称/规格/品牌/型号/客户"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -126,8 +126,38 @@
                 ></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col v-if="!isView" :span="6">
-              <div class="ele-form-actions">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="物品编码:" prop="categoryCode">
+                <el-input
+                  :disabled="isView"
+                  v-model.trim="formData.categoryCode"
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="颜色:" prop="colorKey">
+                <el-input
+                  :disabled="isView"
+                  v-model.trim="formData.colorKey"
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="批次号:" prop="batchNo">
+                <el-input
+                  :disabled="isView"
+                  v-model.trim="formData.batchNo"
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isView" :span="12">
+              <div class="ele-form-actions filter-actions">
                 <el-button
                   type="primary"
                   icon="el-icon-search"
@@ -154,7 +184,7 @@
         class="table"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100% - 100px)"
+        height="calc(100% - 160px)"
         full-height="calc(100vh - 56px)"
         tool-class="ele-toolbar-form"
         :page-size="20"
@@ -247,6 +277,9 @@
           keyWord: '',
           bizType: '',
           categoryLevelId: '',
+          categoryCode: '',
+          colorKey: '',
+          batchNo: '',
           type: ''
         },
         // 表单验证规则
@@ -725,6 +758,9 @@
           this.formData.type = (row.isType == 0 || !row.isType) ? '' : row.isType;
           this.formData.bizType = (row.bizType == 0 || !row.bizType) ? '' : row.bizType;
           this.formData.categoryLevelId = (row.categoryLevelId == 0 || !row.categoryLevelId) ? '' : row.categoryLevelId;
+          this.formData.categoryCode = row.categoryCode || '';
+          this.formData.colorKey = row.colorKey || '';
+          this.formData.batchNo = row.batchNo || '';
         } else {
           this.tableList = [];
           this.formData = Object.assign({}, {
@@ -735,7 +771,10 @@
             keyWord: '',
             type: '',
             bizType: '',
-            categoryLevelId: ''
+            categoryLevelId: '',
+            categoryCode: '',
+            colorKey: '',
+            batchNo: ''
           }, searchParams);
         }
         this.isView = isView;
@@ -776,6 +815,9 @@
         this.formData.type = '';
         this.formData.bizType = '';
         this.formData.categoryLevelId = '';
+        this.formData.categoryCode = '';
+        this.formData.colorKey = '';
+        this.formData.batchNo = '';
         this.$refs.formRef.resetFields()
         this.search();
       }
@@ -783,6 +825,17 @@
   };
 </script>
 <style lang="scss" scoped>
+  .ele-form-search {
+    .el-select {
+      width: 100%;
+    }
+  }
+
+  .filter-actions {
+    display: flex;
+    justify-content: flex-end;
+  }
+
   #inventoryBalance {
     height: 100%;
     width: 100%;

src/views/warehouseManagement/statisticalReports/transceiverDetails/index.vue

@@ -224,7 +224,7 @@
       },
       downLoad(row,type) {
         this.loading = true;
-        
+
         const params = {
           code: row.code,
           name: row.name,

src/views/warehouseManagement/statisticalReports/transceiverDetails/transceiver-details.vue

@@ -51,7 +51,7 @@
                 <el-input
                   :disabled="isView"
                   v-model="formData.keyWord"
-                  placeholder="请输入物品名称/型号/批次号/物品编码/颜色/客户"
+                  placeholder="请输入物品名称/规格/品牌/型号/客户"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -119,8 +119,38 @@
                 ></el-input>
               </el-form-item>
             </el-col> -->
-            <el-col v-if="!isView" :span="6">
-              <div class="ele-form-actions">
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="物品编码:" prop="categoryCode">
+                <el-input
+                  :disabled="isView"
+                  v-model.trim="formData.categoryCode"
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="颜色:" prop="colorKey">
+                <el-input
+                  :disabled="isView"
+                  v-model.trim="formData.colorKey"
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label-width="90px" label="批次号:" prop="batchNo">
+                <el-input
+                  :disabled="isView"
+                  v-model.trim="formData.batchNo"
+                  clearable
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col v-if="!isView" :span="24">
+              <div class="ele-form-actions filter-actions">
                 <el-button
                   type="primary"
                   icon="el-icon-search"
@@ -148,7 +178,7 @@
         :columns="columns"
         :page-size="20"
         :datasource="datasource"
-        height="calc(100vh - 410px)"
+        height="calc(100vh - 470px)"
         full-height="calc(100vh - 56px)"
         tool-class="ele-toolbar-form"
       >
@@ -229,6 +259,9 @@
           keyWord: '',
           bizType: '',
           categoryLevelId: '',
+          categoryCode: '',
+          colorKey: '',
+          batchNo: '',
           type: ''
         },
         // 表单验证规则
@@ -707,6 +740,9 @@
           this.formData.type = (row.isType == 0 || !row.isType) ? '' : row.isType;
           this.formData.bizType = (row.bizType == 0 || !row.bizType) ? '' : row.bizType;
           this.formData.categoryLevelId = (row.categoryLevelId == 0 || !row.categoryLevelId) ? '' : row.categoryLevelId;
+          this.formData.categoryCode = row.categoryCode || '';
+          this.formData.colorKey = row.colorKey || '';
+          this.formData.batchNo = row.batchNo || '';
         } else {
           this.tableList = [];
           this.formData = {
@@ -717,7 +753,10 @@
             keyWord: '',
             type: '',
             bizType: '',
-            categoryLevelId: ''
+            categoryLevelId: '',
+            categoryCode: '',
+            colorKey: '',
+            batchNo: ''
           };
         }
         this.isView = isView;
@@ -763,6 +802,9 @@
         this.formData.type = '';
         this.formData.bizType = '';
         this.formData.categoryLevelId = '';
+        this.formData.categoryCode = '';
+        this.formData.colorKey = '';
+        this.formData.batchNo = '';
         this.$refs.formRef.resetFields()
         this.search();
       }
@@ -770,6 +812,17 @@
   };
 </script>
 <style lang="scss" scoped>
+  .ele-form-search {
+    .el-select {
+      width: 100%;
+    }
+  }
+
+  .filter-actions {
+    display: flex;
+    justify-content: flex-end;
+  }
+
   #inventoryBalance {
     height: 100%;
     width: 100%;