rev:页面优化

lms/nladmin-system/src/main/java/org/nl/wms/autotask/CleanTask.java

@@ -0,0 +1,27 @@
+package org.nl.wms.autotask;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.system.service.param.ISysParamService;
+import org.springframework.stereotype.Component;
+
+/**
+ * 自动清除日志(操作日志、异常日志)数据
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanTask {
+    private final ISysParamService paramService;
+
+    public void run() {
+        //delete from  sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10;
+        WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
+        int days = Integer.parseInt(paramService.findByCode("task_day").getValue());
+        taskTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
+
+        log.info("自动清理任务执行成功...!");
+    }
+
+}

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java

@@ -83,15 +83,6 @@ public class MaterialbaseController {
         return new ResponseEntity<>(MaterOptTypeEnum.getObj(materOpt_code), HttpStatus.OK);
     }
 
-    @PostMapping("/synchronize")
-    @Log("物料同步")
-
-    //@PreAuthorize("@el.check('materialtype:list')")
-    public ResponseEntity<Object> synchronize(@RequestBody Map whereJson) {
-        materialBaseService.synchronize(whereJson);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
     @Log("查询产品系列类型")
 
     @GetMapping("/getProductSeries")

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/MaterialbaseService.java

@@ -88,8 +88,6 @@ public interface MaterialbaseService {
      */
     JSONObject getMaterOptType(String materOpt_code);
 
-    void synchronize(Map whereJson);
-
     JSONArray getProductSeries(String parent_class_id);
 
 

lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/MaterialbaseServiceImpl.java

@@ -39,7 +39,6 @@ import java.util.Set;
 @Slf4j
 public class MaterialbaseServiceImpl implements MaterialbaseService {
     private final ClassstandardService classstandardService;
-    //private final WmsToErpService wmsToErpService;
 
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -214,12 +213,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
         return MaterOptTypeEnum.getObj(materOpt_code);
     }
 
-    @Override
-    public void synchronize(Map whereJson) {
-       /* wmsToErpService.getClassInfo(null);
-        wmsToErpService.getMaterialInfo(null);*/
-    }
-
     @Override
     public JSONArray getProductSeries(String parent_class_id) {
         WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql

@@ -55,11 +55,13 @@
             SELECT
                 task.*,
                 md.class_name task_type_name,
+                user.person_name AS create_name1,
                 dict.label task_status_name,
                 case when task.task_type like '0105%' then 'LK' ELSE task.product_area end AS final_product_area
             FROM
                 sch_base_task task
                 LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
+                LEFT JOIN sys_user user ON user.username = task.create_name
                 LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
             WHERE
                 1=1

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql

@@ -340,57 +340,6 @@
         ENDQUERY
     ENDIF
 
-    IF 输入.flag = "8"
-        		PAGEQUERY
-                    SELECT
-                    	pp.CREATE_DATE AS receive_date,
-                    	pp.VBILLCODE AS source_bill_code,
-                    	mb.material_code,
-                    	mb.material_name,
-                    	class.class_desc,
-                    	mb.material_id,
-                    	pp.QTY AS receive_qty,
-                    	( CASE WHEN a.real_qty IS NULL THEN pp.QTY ELSE ( pp.QTY - a.real_qty ) END ) AS need_qty,
-                    	mu.unit_name AS qty_unit_name,
-                    	'采购订单' AS source_type_name,
-                    	mu.measure_unit_id AS qty_unit_id,
-                    	pp.id AS source_billdtl_id,
-                    	'PO' AS source_bill_type,
-                    	'PCS_IF_PurchaseOrderProc' AS source_bill_table,
-                    	pp.id AS base_billdtl_id,
-                    	'PO' AS base_bill_type,
-                    	'' AS base_bill_code,
-                    	'PCS_IF_PurchaseOrderProc' AS base_bill_table
-                    FROM
-                    	pcs_if_purchaseorderproc pp
-                    	LEFT JOIN md_me_materialbase mb ON mb.ext_id = pp.ITEM_ID
-                    	INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
-                    	INNER JOIN md_pb_measureunit mu ON mu.ext_id = pp.M_UNIT_ID
-                    	LEFT JOIN ( SELECT dtl.source_billdtl_id, SUM( dtl.real_qty ) AS real_qty FROM st_ivt_iostorinvdtl dtl GROUP BY source_billdtl_id ) a ON a.source_billdtl_id = pp.id
-                    WHERE
-                    	pp.proc_status IN ( '01', '02' )
-                    AND
-                        pp.DR='0'
-                    AND
-                        mb.material_type_id IN 输入.clsss_ids
-                    OPTION 输入.material_search <> ""
-                        (mb.material_code like 输入.material_search
-                        OR
-                        mb.material_name like 输入.material_search)
-                    ENDOPTION
-                    OPTION 输入.bill_code <> ""
-                        pp.VBILLCODE like 输入.bill_code
-                    ENDOPTION
-                    OPTION 输入.begin_time <> ""
-                        pp.CREATE_DATE >= 输入.begin_time
-                    ENDOPTION
-                    OPTION 输入.end_time <> ""
-                        pp.CREATE_DATE <= 输入.end_time
-                    ENDOPTION
-        	        ENDSELECT
-                ENDPAGEQUERY
-        ENDIF
-
         IF 输入.flag = "9"
             PAGEQUERY
                 SELECT

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/SendReceiveQuery.wql

@@ -18,7 +18,6 @@
 	输入.begin_time				    	         TYPEAS s_string
 	输入.end_time				    	         TYPEAS s_string
 	输入.material_code				    	     TYPEAS s_string
-	输入.classIds			                     TYPEAS f_string
 	输入.pcsn			                         TYPEAS s_string
 	输入.sap_pcsn			                     TYPEAS s_string
 	输入.package_box_sn			                 TYPEAS s_string
@@ -53,14 +52,9 @@
 			    stor.stor_name,
 			    da.sect_date,
             	da.pcsn,
-            	da.quality_scode,
-                class.class_name,
-                class.class_code,
                 mater.material_id,
                 mater.material_code,
                 mater.material_name,
-                mater.material_model,
-                unit.unit_name,
                 da.start_num,
                 da.in_num,
                 da.out_num,
@@ -77,22 +71,17 @@
                     sum(end_num) AS end_num,
                     sum(more_num) AS more_num,
                     sum(less_num) AS less_num,
-                    max(material_id) AS material_id,
+                    max( material_id ) AS material_id,
                     max(stor_id) AS stor_id,
-                    max(sect_date) AS sect_date,
+                    sect_date,
-                    max(quality_scode) AS quality_scode,
+                    pcsn
-                    max(pcsn) AS pcsn
                 FROM
                     ST_IVT_IOStorDaily a
                 GROUP BY
-                    a.material_id,
-                    a.quality_scode,
                     a.pcsn,
                     a.sect_date
                 ) AS da
             LEFT JOIN MD_ME_MaterialBase mater ON da.material_id = mater.material_id
-            LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id
-            LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id
             LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id
             LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = da.pcsn
             WHERE 1=1
@@ -127,10 +116,6 @@
                         sub.package_box_sn like 输入.package_box_sn
                 ENDOPTION
 
-                OPTION 输入.classIds <> ""
-                         class.class_id in 输入.classIds
-                ENDOPTION
-
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF

lms/nladmin-ui/src/views/login.vue

@@ -56,7 +56,7 @@ export default {
       cookiePass: '',
       loginForm: {
         username: 'admin',
-        password: '123456',
+        password: '',
         rememberMe: false,
         code: '',
         uuid: ''

lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue

@@ -36,18 +36,7 @@
         </el-col>
       </el-row>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
+      <crudOperation/>
-        <el-button
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="synchronize()"
-        >
-          同步
-        </el-button>
-      </crudOperation>
       <!--表单组件-->
       <el-dialog
         :close-on-click-modal="false"
@@ -349,15 +338,6 @@ export default {
         }
       })
     },
-    synchronize() {
-      this.fullscreenLoading = true
-      crudMaterialbase.synchronize(this.crud.query).then(res => {
-        this.fullscreenLoading = false
-        this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-      }).catch(() => {
-        this.fullscreenLoading = false
-      })
-    },
     queryClassId() {
       const param = {
         'class_idStr': this.class_idStr

lms/nladmin-ui/src/views/wms/basedata/master/material/materialbase.js

@@ -40,14 +40,6 @@ export function isAlongMaterType(data) {
   })
 }
 
-export function synchronize(data) {
-  return request({
-    url: 'api/Materialbase/synchronize',
-    method: 'post',
-    data
-  })
-}
-
 export function getProductSeries() {
   return request({
     url: 'api/Materialbase/getProductSeries',
@@ -55,4 +47,4 @@ export function getProductSeries() {
   })
 }
 
-export default { add, edit, del, getMaterOptType, isAlongMaterType, synchronize, getProductSeries }
+export default { add, edit, del, getMaterOptType, isAlongMaterType, getProductSeries }

lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue

@@ -175,7 +175,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="remark" label="备注" />
-        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" min-width="151" show-overflow-tooltip />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation

lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue

@@ -174,7 +174,7 @@
             {{ dict.label.is_used[scope.row.is_used] }}
           </template>
         </el-table-column>
-        <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" show-overflow-tooltip width="150px;"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -467,7 +467,7 @@
         <el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
         <el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
         <el-table-column prop="is_call" label="是否呼叫" width="100px" :formatter="formatChildCallName"/>
-        <el-table-column prop="qzzno" label="气涨轴编码" width="150px"/>
+        <el-table-column prop="qzzno" label="气涨轴编码" width="160px"/>
         <el-table-column prop="start_time" label="开始时间" width="150px"/>
         <el-table-column prop="end_time" label="结束时间" width="150px"/>
         <!--      <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -199,7 +199,7 @@
         >
           仓位同步
         </el-button>-->
-        <el-button
+<!--        <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -208,7 +208,7 @@
           @click="downdtl"
         >
           导出Excel
-        </el-button>
+        </el-button>-->
       </crudOperation>
       <!--表单组件-->
       <el-dialog
@@ -427,6 +427,8 @@ export default {
     crudPoint.getRegion().then(res => {
       this.regionList = res
     })
+    this.$set(this.query, 'region_id', '1582991348217286656')
+    this.crud.toQuery()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

lms/nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue

@@ -131,17 +131,6 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="单据日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="模糊查询">
             <el-input
               v-model="query.bill_code"
@@ -168,6 +157,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="单据日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>

lms/nladmin-ui/src/views/wms/st/inStor/check/index.vue

@@ -176,14 +176,14 @@
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.check_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="150" prop="status" label="单据状态" />
+        <el-table-column show-overflow-tooltip :formatter="stateFormat" width="110" prop="status" label="单据状态" />
         <el-table-column prop="stor_name" label="仓库" width="120" />
-        <el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="150" label="业务类型" />
+        <el-table-column show-overflow-tooltip prop="check_type" :formatter="bill_typeFormat" width="110" label="业务类型" />
-        <el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="150" label="盘点状态" />
+        <el-table-column show-overflow-tooltip prop="is_nok" :formatter="is_nokFormat" width="90" label="盘点状态" />
-        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="150" />
+        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="110" />
-        <el-table-column label="箱数" align="center" prop="dtl_num" width="150" />
+        <el-table-column label="箱数" align="center" prop="dtl_num" width="110" />
-        <el-table-column label="子卷数" align="center" prop="pcsn_num" width="150" />
+        <el-table-column label="子卷数" align="center" prop="pcsn_num" width="110" />
-        <el-table-column show-overflow-tooltip prop="input_time" width="170" label="创建日期" />
+        <el-table-column show-overflow-tooltip prop="input_time" width="151" label="创建日期" />
       </el-table>
       <!--分页组件-->
       <pagination />

lms/nladmin-ui/src/views/wms/st/inbill/AddDialog.vue

@@ -142,7 +142,7 @@
       <el-table-column show-overflow-tooltip width="150" prop="product_description" label="物料描述" />
       <el-table-column show-overflow-tooltip prop="width" label="幅宽" />
       <el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" />
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="120" fixed="right">
         <template scope="scope">
           <el-button
             type="danger"

lms/nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -225,7 +225,7 @@
           </template>
         </el-table-column>
         <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" label="单据状态" />
-        <el-table-column prop="stor_name" label="仓库" />
+        <el-table-column prop="stor_name" label="仓库" width="100px;"/>
         <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" :formatter="bill_typeFormat" label="业务类型" />
         <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="业务日期" />
         <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" label="生成方式" />
@@ -237,9 +237,9 @@
         </el-table-column>
         <el-table-column label="交货单" align="center" prop="vbeln" width="150px" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="制单人" align="center" prop="input_optname" />
+        <el-table-column label="制单人" align="center" prop="input_optname" width="100px;"/>
         <el-table-column label="制单时间" align="center" prop="input_time" width="150" />
-        <el-table-column label="修改人" align="center" prop="update_optname" />
+        <el-table-column label="修改人" align="center" prop="update_optname" width="100px;"/>
         <el-table-column label="修改时间" align="center" prop="update_time" width="150" />
         <el-table-column label="分配人" align="center" prop="dis_optname" width="140px" />
         <el-table-column label="分配时间" align="center" prop="dis_time" width="150" />

lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -243,7 +243,7 @@
           <span>{{ scope.row.remark }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="160" fixed="right">
+      <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="120" fixed="right">
         <template scope="scope">
           <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
         </template>

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -260,7 +260,7 @@
         <el-table-column show-overflow-tooltip prop="instorage_time" width="150px" label="入库时间" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" width="150px" label="任务号" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code" width="150px" label="出库点" align="center" />
-        <el-table-column align="center" label="操作" width="160" fixed="right">
+        <el-table-column align="center" label="操作" width="120" fixed="right">
           <template scope="scope">
             <el-button :disabled="tabledisabled(scope.row)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)" />
           </template>

lms/nladmin-ui/src/views/wms/stat/pastivt/index.vue

@@ -129,17 +129,6 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
 
           <el-form-item label="客户编码">
             <el-input
@@ -153,6 +142,17 @@
             />
           </el-form-item>
 
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="是否超期">
             <el-switch
               v-model="query.is_sid"
@@ -213,7 +213,7 @@
         <el-table-column show-overflow-tooltip prop="date_of_fg_inbound" label="入库日期" :min-width="flexWidth('date_of_fg_inbound',crud.data,'入库日期')" />
         <el-table-column show-overflow-tooltip prop="box_weight" label="木箱自身重量" :min-width="flexWidth('box_weight',crud.data,'木箱自身重量')" />
         <el-table-column show-overflow-tooltip prop="quality_guaran_period" label="保质期" :min-width="flexWidth('quality_guaran_period',crud.data,'保质期')" />
-        <el-table-column show-overflow-tooltip prop="un_plan_product_property1" label="子卷的悟性值1" :min-width="flexWidth('un_plan_product_property1',crud.data,'子卷的悟性值1')" />
+        <el-table-column show-overflow-tooltip prop="un_plan_product_property1" label="子卷的悟性值1" width="2100px;" />
         <el-table-column show-overflow-tooltip prop="un_plan_product_property2" label="子卷的悟性值2" :min-width="flexWidth('un_plan_product_property2',crud.data,'子卷的悟性值2')" />
         <el-table-column show-overflow-tooltip prop="un_plan_product_property3" label="子卷的悟性值3" :min-width="flexWidth('un_plan_product_property3',crud.data,'子卷的悟性值3')" />
         <el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" :min-width="flexWidth('box_type',crud.data,'木箱料号')" />

lms/nladmin-ui/src/views/wms/statistics/sendReceiveQuery/index.vue

@@ -96,25 +96,15 @@
       <el-table ref="table" :cell-style="cellStyleMst" show-summary :summary-method="getSum" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column prop="stor_name" label="仓库"/>
         <el-table-column prop="sect_date" label="日期" width="100px" />
-<!--        <el-table-column prop="class_code" label="物料分类编码" width="100px" />-->
-<!--        <el-table-column prop="class_name" label="物料分类名称" width="100px" />-->
         <el-table-column prop="material_code" label="物料编码" min-width="150" show-overflow-tooltip/>
         <el-table-column prop="material_name" label="物料名称" min-width="150" show-overflow-tooltip/>
         <el-table-column prop="material_model" label="规格/型号" min-width="150" show-overflow-tooltip/>
-        <el-table-column prop="unit_name" label="主单位"/>
         <el-table-column prop="pcsn" label="批次号" min-width="140" show-overflow-tooltip/>
         <el-table-column prop="sap_pcsn" label="sap批次" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="package_box_sn" label="木箱号" width="250px" min-width="120" show-overflow-tooltip/>
-
-        <!--        <el-table-column prop="dept_name" label="所属组织" min-width="120" show-overflow-tooltip/>-->
-<!--        <el-table-column prop="quality_scode" label="品质类型" :formatter="formatQualityName" />-->
-<!--        <el-table-column prop="ivt_level" label="质量等级" :formatter="formatIvtName" />-->
-<!--        <el-table-column prop="is_active" label="是否可用" :formatter="formatIsName" />-->
         <el-table-column prop="start_num" label="期初主数量" :formatter="crud.formatNum3" width="100px" />
         <el-table-column prop="in_num" label="入库主数量" :formatter="crud.formatNum3" width="100px" />
         <el-table-column prop="out_num" label="出库主数量" :formatter="crud.formatNum3" width="100px" />
-<!--        <el-table-column prop="less_num" label="其他出" :formatter="crud.formatNum3"/>-->
-<!--        <el-table-column prop="more_num" label="其他入" :formatter="crud.formatNum3"/>-->
         <el-table-column prop="end_num" label="结存主数量" :formatter="crud.formatNum3" width="100px" />
       </el-table>
       <!--分页组件-->