修改台账搜索条件

src/utils/dict/warehouse.js

@@ -36,13 +36,14 @@ export const sceneState = [
   { code: 2, label: '采购入库', documentsName: '采购收货单' },
   { code: 3, label: '归还入库', documentsName: '出库单' },
   { code: 4, label: '领料退货入库' },
-  { code: 5, label: '其他入库' },
+  // { code: 5, label: '其他入库' },
   { code: 6, label: '销售退货入库', documentsName: '销售订单' },
   { code: 7, label: '销售受托入库', documentsName: '受托收货单' },
   { code: 8, label: '半成品入库', documentsName: '委外工单' },
   { code: 9, label: '外协入库' },
   { code: 10, label: '委外入库' },
-  { code: 11, label: '委外退货入库' }
+  { code: 11, label: '委外退货入库' },
+  { code: 99, label: '其他入库' }
 ];
 export const outputSceneState = [
   { code: 1, label: '退供出库' },

src/views/warehouseManagement/components/selectType.vue

@@ -109,7 +109,7 @@
               :show-overflow-tooltip="true"
             ></el-table-column>
           </el-table>
-          <div class="right mt10" v-if="bizScene != 5">
+          <div class="right mt10">
             <el-pagination
               background
               layout="total, sizes, prev, pager, next, jumper"

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -174,7 +174,7 @@
               },
               {
                 prop: 'code',
-                label: '编码',
+                label: '物品编码',
                 showOverflowTooltip: true
               },
               {
@@ -288,7 +288,7 @@
               },
               {
                 prop: 'code',
-                label: '编码',
+                label: '物品编码',
                 showOverflowTooltip: true
               },
               {
@@ -420,11 +420,11 @@
                 label: '包装编码',
                 showOverflowTooltip: true
               },
-              // {
-              //   prop: 'packageNo',
-              //   label: '编号',
-              //   showOverflowTooltip: true
-              // },
+              {
+                prop: 'categoryCode',
+                label: '物品编码',
+                showOverflowTooltip: true
+              },
               {
                 prop: 'name',
                 label: '名称',
@@ -576,7 +576,7 @@
               },
               {
                 prop: 'assetCode',
-                label: '编号',
+                label: '物品编码',
                 showOverflowTooltip: true
               },
               {

src/views/warehouseManagement/stockLedger/components/item-search.vue

@@ -96,7 +96,11 @@
             </template>
           </el-form-item>
         </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+
+        <el-col
+          v-if="dimension == 3"
+          v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
+        >
           <el-form-item label="物品编码:" prop="categoryCode">
             <el-input
               clearable
@@ -105,6 +109,18 @@
             ></el-input>
           </el-form-item>
         </el-col>
+        <el-col
+          v-else
+          v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }"
+        >
+          <el-form-item label="物品编码:" prop="code">
+            <el-input
+              clearable
+              placeholder="请输入"
+              v-model.trim="params.code"
+            ></el-input>
+          </el-form-item>
+        </el-col>
         <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
           <el-form-item label="物品名称:" prop="assetName">
             <el-input
@@ -225,6 +241,7 @@
         clientCode: '',
         modelType: '',
         specification: '',
+        code: '',
         categoryCode: '',
         assetName: ''
       };

src/views/warehouseManagement/stockManagement/index.vue

@@ -221,7 +221,7 @@
             width: 150
           },
           {
-            prop: 'extInfo.documentSource',
+            prop: 'sourceBizNo',
             label: '来源单据',
             align: 'center',
             showOverflowTooltip: true