库存修改

src/views/inventoryControl/newInventory/cardIsIssued/data.js

@@ -41,7 +41,7 @@ export const getZxqdFindConfig = (route) => ({
     paginStart: true, //是否显示分页查询 (默认false)
     dataListLoading: false,
     paging: {
-        pageSize: 10,
+        pageSize: 15,
         currentPage: 1,
         total: 0
     },
@@ -102,14 +102,6 @@ export const getZxqdFindConfig = (route) => ({
                 type: 'input',
             }
         },
-        {
-            prop: "provider",
-            label: "卡片厂商",
-            form: {
-                formLabelWidth: formLabelWidth,
-                type: 'input',
-            }
-        },
         {
             prop: "cardType",
             label: "卡片类型",
@@ -187,14 +179,6 @@ export const getZxqdFindConfig = (route) => ({
                 },
             }
         },
-        {
-            prop: "issueCount",
-            label: "发行次数",
-            form: {
-                formLabelWidth: formLabelWidth,
-                type: 'input',
-            }
-        },
         {
             prop: "chanel",
             label: "渠道",
@@ -220,6 +204,14 @@ export const getZxqdFindConfig = (route) => ({
                 type: 'input',
             }
         },
+        {
+            prop: "provider",
+            label: "卡片厂商",
+            form: {
+                formLabelWidth: formLabelWidth,
+                type: 'input',
+            }
+        },
         {
             prop: "insertTime",
             label: "创建时间",

src/views/inventoryControl/newInventory/cardIsIssued/index.vue

@@ -4,19 +4,19 @@
       @btnSearch="btnSearch" @CurrentChange="handleCurrentChange" @importData="importData" @download="downloadHandle"
       @refreshLeft="refreshLeft" @add="Adds" @cancel="cancel" @submit="submitAdd" @handleEdit="itemEdit">
       <template #search>
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.batchNo" style="width: 200px"
+        <el-input maxlength="30" v-trim clearable v-model="searchForm.batchNo" style="width: 200px"
           placeholder="请输入批次号" />
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.cardNo" style="width: 200px"
-          placeholder="请输入卡号" />
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.startCardNo" style="width: 200px"
+<!--        <el-input maxlength="60" v-trim clearable v-model="searchForm.cardNo" style="width: 200px"-->
+<!--          placeholder="请输入卡号" />-->
+        <el-input maxlength="20" v-trim clearable v-model="searchForm.startCardNo" style="width: 200px"
           placeholder="请输入起始卡号" />
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.endCardNo" style="width: 200px"
+        <el-input maxlength="20" v-trim clearable v-model="searchForm.endCardNo" style="width: 200px"
           placeholder="请输入结束卡号" />
 <!--        <el-input maxlength="60" v-trim clearable v-model="searchForm.version" style="width: 200px" placeholder="请输入卡片版本号" />-->
-        <el-select clearable v-model="searchForm.cardType" style="width: 200px;" placeholder="请选择卡片类型">
+        <el-select clearable v-model="searchForm.cardType" style="width: 150px;" placeholder="请选择卡片类型">
           <el-option v-for="item in CARD_TYPE" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-select clearable v-model="searchForm.status" style="width: 200px;" placeholder="请选择发行状态">
+        <el-select clearable v-model="searchForm.status" style="width: 150px;" placeholder="请选择发行状态">
           <el-option v-for="item in ISSUE_STATUS" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </template>
@@ -66,6 +66,9 @@ function getList() {
       params[key] = searchFormList[key]
     }
   }
+  if(searchFormList.status === 0){
+    params.status = 0
+  }
   BaseService.postN('/invw/api/cards/page', params).then((res: any) => {
     if (res && res.code === 0) {
       //数据转换

src/views/inventoryControl/newInventory/cardIssuanceBatch/data.js

@@ -91,7 +91,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
     paginStart: true, //是否显示分页查询 (默认false)
     dataListLoading: false,
     paging: {
-        pageSize: 10,
+        pageSize: 15,
         currentPage: 1,
         total: 0
     },
@@ -214,7 +214,6 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
         {
             prop: "status",
             label: "申请状态",
-            width: "150",
             listData: APPLY_STATUS,
             funRuleStarts: true, //是否启用转换规则
             funRule: (value) => {
@@ -284,6 +283,15 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
                 type: 'input',
             }
         },
+        {
+            prop: "cardProvider",
+            label: "厂商",
+            hide: true,
+            form: {
+                formLabelWidth: formLabelWidth,
+                type: 'input',
+            }
+        },
         {
             prop: "insertTime",
             label: "创建时间",

src/views/inventoryControl/newInventory/cardIssuanceBatch/index.vue

@@ -13,8 +13,8 @@
         <el-select clearable v-model="searchForm.cardType" style="width: 200px;" placeholder="请选择卡片类型">
           <el-option v-for="item in CARD_TYPE" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-date-picker unlink-panels v-model="value1" type="daterange" range-separator="到" start-placeholder="开始日期"
-          end-placeholder="结束日期" format="YYYYMMDD" value-format="YYYYMMDD" @change="dateChangeHandle" />
+        <el-date-picker unlink-panels v-model="value1" type="daterange" range-separator="到" start-placeholder="批次申请开始日期"
+          end-placeholder="批次申请结束日期" format="YYYYMMDD" value-format="YYYYMMDD" @change="dateChangeHandle" />
       </template>
     </crud-template>
   </div>

src/views/inventoryControl/newInventory/obuIsIssued/data.js

@@ -55,7 +55,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
     paginStart: true, //是否显示分页查询 (默认false)
     dataListLoading: false,
     paging: {
-        pageSize: 10,
+        pageSize: 15,
         currentPage: 1,
         total: 0
     },
@@ -101,7 +101,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
         {
             prop: "batchNo",
             label: "批次号",
-            width: "140",
+            width: "115",
             form: {
                 formLabelWidth: formLabelWidth,
                 type: 'input',
@@ -109,15 +109,32 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
         },
         {
             prop: "serialNo",
-            label: "OBU合同序列号",
+            label: "合同序列号",
+            width: "135",
             form: {
                 formLabelWidth: formLabelWidth,
                 type: 'input',
             }
         },
+        {
+            prop: "encryptType",
+            label: "OBU类型",
+            listData: ENCRYPT_TYPE,
+            width: '100',
+            form: {
+                formLabelWidth: formLabelWidth,
+                type: 'input',
+                listData: ENCRYPT_TYPE,
+                funRuleStarts: true, //是否启用转换规则
+                funRule: (value) => {
+                    return getLabel(ENCRYPT_TYPE, value);
+                },
+            }
+        },
         {
             prop: "cardNo",
             label: "卡号",
+            width: '160',
             form: {
                 formLabelWidth: formLabelWidth,
                 type: 'input',
@@ -185,7 +202,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
             prop: "status",
             label: "发行状态",
             listData: ISSUE_STATUS,
-            width: "80",
+            width: "75",
             funRuleStarts: true,
             funRule: (value) => {
                 return getLabel(ISSUE_STATUS, value);
@@ -273,8 +290,8 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
             }
         },
         {
-            prop: "providerID",
-            label: "卡片厂商代码",
+            prop: "version",
+            label: "版本号",
             hide: true,
             form: {
                 formLabelWidth: formLabelWidth,

src/views/inventoryControl/newInventory/obuIsIssued/index.vue

@@ -5,9 +5,12 @@
       @refreshLeft="refreshLeft" @add="Adds" @cancel="cancel" @submit="submitAdd" @handleEdit="itemEdit">
       <template #search>
         <el-input maxlength="60" v-trim clearable v-model="searchForm.batchNo" style="width: 200px" placeholder="请输入批次号" />
-        <el-input maxlength="60" v-trim clearable v-model="searchForm.serialNo" style="width: 200px" placeholder="请输入OBU合同序列号" />
+        <el-input maxlength="60" v-trim clearable v-model="searchForm.serialNo" style="width: 200px" placeholder="请输入合同序列号" />
 <!--        <el-input maxlength="60" v-trim clearable v-model="searchForm.startSerialNo" style="width: 200px" placeholder="请输入起始OBU合同序列号" />-->
 <!--        <el-input maxlength="60" v-trim clearable v-model="searchForm.endSerialNo" style="width: 200px" placeholder="请输入结束OBU合同序列号" />-->
+        <el-select maxlength="60" v-trim clearable v-model="searchForm.encryptType" style="width: 200px" placeholder="请选OBU择类型" >
+          <el-option v-for="item in ENCRYPT_TYPE" :key="item.value" :label="item.label" :value="item.value"/>
+        </el-select>
         <el-select maxlength="60" v-trim clearable v-model="searchForm.status" style="width: 200px" placeholder="请选择发行状态" >
           <el-option v-for="item in ISSUE_STATUS" :key="item.value" :label="item.label" :value="item.value"/>
         </el-select>
@@ -25,7 +28,7 @@ import BaseService from '@/utils/baseService' //引入接口请求
 import {
   ElMessage,
 } from 'element-plus' //提示
-import { getZxqdFindConfig,ISSUE_STATUS } from "./data.js";
+import { getZxqdFindConfig,ISSUE_STATUS,ENCRYPT_TYPE } from "./data.js";
 import { useRoute } from 'vue-router'
 import { exportFn } from '@/views/settlement/exportFn'
 //或取路由传入过来的对象数据
@@ -60,6 +63,9 @@ function getList() {
       params[key] = searchFormList[key]
     }
   }
+  if(searchFormList.status === 0){
+    params.status = 0
+  }
   BaseService.postN('/invw/api/queryGmobus/page', params).then((res: any) => {
     if (res && res.code === 0) {
       //数据转换

src/views/inventoryControl/newInventory/obuIssuanceBatch/data.js

@@ -25,7 +25,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
     paginStart: true, //是否显示分页查询 (默认false)
     dataListLoading: false,
     paging: {
-        pageSize: 10,
+        pageSize: 15,
         currentPage: 1,
         total: 0
     },
@@ -71,7 +71,6 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
         {
             prop: "batchNo",
             label: "批次号",
-            width: "130",
             form: {
                 formLabelWidth: formLabelWidth,
                 type: 'input',
@@ -89,7 +88,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
         {
             prop: "startNum",
             label: "OBU起始号",
-            width: "150",
+            width: "145",
             form: {
                 formLabelWidth: formLabelWidth,
                 type: 'input',
@@ -98,7 +97,7 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
         {
             prop: "endNum",
             label: "OBU结束号",
-            width: "150",
+            width: "145",
             form: {
                 formLabelWidth: formLabelWidth,
                 type: 'input',
@@ -159,6 +158,15 @@ export const getZxqdFindConfig = (route, agencyIdList) => ({
                 type: 'input',
             }
         },
+        {
+            prop: "cardProvider",
+            label: "厂商",
+            hide: true,
+            form: {
+                formLabelWidth: formLabelWidth,
+                type: 'input',
+            }
+        },
         {
             prop: "insertTime",
             label: "创建时间",

src/views/inventoryControl/newInventory/obuIssuanceBatch/index.vue

@@ -9,6 +9,8 @@
         <el-select maxlength="60" v-trim clearable v-model="searchForm.obuType" style="width: 200px" placeholder="请选择设备类型" >
           <el-option v-for="item in OBU_TYPE" :key="item.value" :label="item.label" :value="item.value"/>
         </el-select>
+        <el-date-picker unlink-panels v-model="value1" type="daterange" range-separator="到" start-placeholder="批次申请开始日期"
+        end-placeholder="批次申请结束日期" format="YYYYMMDD" value-format="YYYYMMDD" @change="dateChangeHandle" />
 <!--        <el-input maxlength="60" v-trim clearable v-model="searchForm.providerID" style="width: 200px" placeholder="请输入卡片厂商代码" />-->
       </template>
     </crud-template>
@@ -28,6 +30,7 @@ import { exportFn } from '@/views/settlement/exportFn'
 //或取路由传入过来的对象数据
 const route = useRoute()
 const widthBase = '120px';
+const value1 = ref();
 const crudRef = ref()
 let tableData: any = ref([])
 const itemStartValue = ref("1")
@@ -74,7 +77,15 @@ function getList() {
   })
 }
 
-
+function dateChangeHandle(val: any) {
+  if (val) {
+    searchForm.value.batchDateStart = val[0];
+    searchForm.value.batchDateEnd = val[1];
+  } else {
+    searchForm.value.batchDateStart = "";
+    searchForm.value.batchDateEnd = "";
+  }
+}
 
 const Adds = () => {
   itemStartValue.value = 1
@@ -128,6 +139,7 @@ function handleAvatarSuccess(response: any, row) {
 // 搜索重置
 function refreshLeft() {
   searchForm.value = {}
+  value1.value = ''
   getList()
 }
 

src/views/onlineBusinessHall/productManagement/equityProduct/index.vue

@@ -827,7 +827,7 @@ let field = ref({
         width: '45%',
         formLabelWidth: formLabelWidth,
         type: 'select',
-        required: false,
+        required: true,
         listData: WHETHER_TYPE,
       },
     },