用户管理修改

src/store/initData.ts

@@ -65,9 +65,7 @@ export default createStore<any>({
           }
           sessionStorage.setItem('dictData', JSON.stringify(newData))
           context.commit('DictData', newData)
-        } else {
-          ElMessage.error(res.message)
-        }
+        } 
       })
     },
     // 授权的系统
@@ -89,8 +87,6 @@ export default createStore<any>({
           
           let systemTypeList = bizContent.list || []
           context.commit('MysystemList', systemTypeList)
-        } else {
-          ElMessage.error(res.message)
         }
       })
     },

src/views/inventoryControl/newInventory/allocationManagement/addOrUpdate.vue

@@ -45,8 +45,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="申请数量" prop="applyCount">
-                        <el-input clearable v-model="addForm.applyCount" placeholder="请输入申请数量">
-                        </el-input>
+                        <el-input clearable v-model="addForm.applyCount" placeholder="请输入申请数量" :disabled="typeOption === 'view' || typeOption === 'sure'"/>
                     </el-form-item>
                     <!-- <el-form-item label="申请单类型" prop="obuType">
                         <el-select clearable v-model="addForm.obuType" placeholder="请选择申请单类型"
@@ -56,28 +55,33 @@
                         </el-select>
                     </el-form-item> -->
                     <el-form-item label="收货仓库" prop="receiveStoreCode">
-                        <el-cascader v-model="addForm.receiveStoreCode"
+                        <!-- <el-cascader v-model="addForm.receiveStoreCode"
                             :disabled="typeOption === 'view' || typeOption === 'sure'" :options="interfaceLowerListArr"
-                            :props="props2" clearable @change="handleChange" />
+                            :props="props2" clearable @change="handleChange" /> -->
+
+                            <el-select v-model="addForm.receiveStoreCode" placeholder="请选择" :disabled="typeOption === 'view' || typeOption === 'sure'">
+                                <el-option v-for="item in props.storeList" :key="item.value" :label="item.name" :value="item.code" />
+                            </el-select>
                     </el-form-item>
                     <el-form-item label="发货仓库" prop="sendStoreCode">
                         <el-cascader v-model="addForm.sendStoreCode"
                             :disabled="typeOption === 'view' || typeOption === 'sure'" :options="interfaceLowerListArr"
                             :props="props2" clearable @change="handleChange" />
+                        <!-- <el-select v-model="addForm.sendStoreCode" placeholder="请选择" :disabled="typeOption === 'view' || typeOption === 'sure'">
+                            <el-option v-for="item in props.storeList" :key="item.value" :label="item.name" :value="item.code" />
+                        </el-select> -->
                     </el-form-item>
                     <el-form-item label="签类型" prop="obuType" v-if="addForm.inventoryType === 'OBU'">
-                        <el-select clearable v-model="addForm.obuType" placeholder="请选择签类型"
-                            :disabled="typeOption === 'view' || typeOption === 'sure'">
+                        <el-select clearable v-model="addForm.obuType" placeholder="请选择签类型">
                             <el-option v-for="item in obuType" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                                :value="item.value" :disabled="typeOption === 'view' || typeOption === 'sure'"/>
                         </el-select>
                     </el-form-item>
 
                     <el-form-item label="卡类型" prop="cardType" v-if="addForm.inventoryType === 'CARD'">
-                        <el-select clearable v-model="addForm.cardType" placeholder="请选择卡类型"
-                            :disabled="typeOption === 'view' || typeOption === 'sure'">
+                        <el-select clearable v-model="addForm.cardType" placeholder="请选择卡类型" :disabled="typeOption === 'view' || typeOption === 'sure'">
                             <el-option v-for="item in cardType" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                                :value="item.value" :disabled="typeOption === 'view' || typeOption === 'sure'"/>
                         </el-select>
                     </el-form-item>
                     <!-- filePath multiple-->
@@ -225,6 +229,12 @@ import BaseService from "@/utils/baseService";
 import { getInfoApi, sureApi, checkNumApi, checkNumDetailApi, addApi, updateApi, lowerListApi, agencyApi, importReturnApi } from "@/api/inventoryControl/putInstorage";
 import $storeinitData from "@/store/initData"; //引入tab vuex
 const URLS = import.meta.env.VITE_APP_BASE_URL;
+  const props = defineProps({
+    storeList: {
+      type: Object,
+      default: {},
+    },
+  })
 // 声明事件
 const emit = defineEmits([
     "closeHandle",
@@ -388,7 +398,9 @@ function changeDeviceType() {
 }
 // 初始化
 function init(row: any) {
-    idex = row.id
+    if(row!==null){
+        idex = row.id 
+    }
     getLowerList();
     // getAgency();
     clearData();
@@ -893,8 +905,6 @@ function getLowerList() {
             console.log(bizContent)
             let data = bizContent.idNames || [];
             interfaceLowerListArr.value = data
-        } else {
-            ElMessage.error(res.message)
         }
     })
 }

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

@@ -1,16 +1,17 @@
 <template>
   <div class="page-home">
     <div class="search-wrap">
-      <el-select clearable v-model="searchForm.brand" style="width: 200px" placeholder="请选择设备厂商">
-        <el-option v-for="item in manufacturerList" :key="item.value" :label="item.label" :value="item.value" />
+      <el-select clearable v-model="searchForm.inventoryType" style="width: 120px" placeholder="设备类型" @change="changeDeviceType">
+        <el-option v-for="item in inventoryType" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-select clearable v-model="searchForm.obuType" style="width: 200px" placeholder="请选择设备类型">
-        <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
+      <el-select clearable v-model="searchForm.brand" style="width: 120px" placeholder="设备厂商" no-data-text="请先选择设备类型">
+        <el-option v-if="searchForm.inventoryType === 'CARD'" v-for="item in cardManufacturerList" :key="item.value" :label="item.label" :value="item.value" />
+        <el-option v-if="searchForm.inventoryType === 'OBU'" v-for="item in manufacturerList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-select clearable v-model="searchForm.version" style="width: 200px" placeholder="请选择设备型号">
+      <el-select clearable v-model="searchForm.version" style="width: 120px" placeholder="设备型号">
         <el-option v-for="item in modelList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-select clearable v-model="searchForm.applyStatus" style="width: 200px" placeholder="请选择申请状态">
+      <el-select clearable v-model="searchForm.applyStatus" style="width: 120px" placeholder="申请状态">
         <el-option v-for="item in resultList" :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="开始日期"
@@ -22,20 +23,18 @@
       <el-button type="warning" icon="refreshLeft" @click="refreshLeft">
         重置
       </el-button>
-    </div>
-    <div class="table-btn">
       <el-button type="primary" @click="addHandle" icon="Plus">
         设备调拨
       </el-button>
     </div>
     <div class="table-list">
-      <el-table :data="tableData" @selection-change="selectionChangeHandle" :border="true" row-key="id"
+      <el-table :data="tableData" @selection-change="selectionChangeHandle" :border="true" row-key="id" size="small"
         v-loading="tableLoding" show-overflow-tooltip>
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="申请编号" width="100"></el-table-column>
-        <el-table-column prop="sendStoreCode" label="发货仓库" width="100"></el-table-column>
-        <el-table-column prop="receiveStoreCode" label="收货仓库" width="100"></el-table-column>
-        <el-table-column prop="brand" label="厂商" min-width="100">
+        <!-- <el-table-column type="selection"  width="28"></el-table-column> -->
+        <el-table-column prop="applyNo" label="申请编号" width="200"></el-table-column>
+        <el-table-column prop="sendStoreCode" label="发货仓库" width="155"></el-table-column>
+        <el-table-column prop="receiveStoreCode" label="收货仓库" width="155"></el-table-column>
+        <el-table-column prop="brand" label="厂商" min-width="70">
           <template v-slot="scope">
             <span v-if="scope.row.inventoryType == 'CARD'">
               {{ getDictLabel(cardManufacturerList, scope.row.brand) }}
@@ -45,47 +44,47 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="inventoryType" label="采购设备类型" min-width="120">
+        <el-table-column prop="inventoryType" label="采购设备类型" min-width="60">
           <template v-slot="scope">
-            <span>{{ getDictLabel(typeList, scope.row.inventoryType) }}</span>
+          {{ scope.row.inventoryType==='CARD'?'卡':'签' }}
           </template>
         </el-table-column>
-        <el-table-column prop="version" label="设备版本" min-width="100">
+        <el-table-column prop="version" label="设备版本" min-width="70">
           <template v-slot="scope">
             <span>{{ getDictLabel(modelList, scope.row.version) }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="applyCount" label="备货数量"></el-table-column>
-        <el-table-column prop="applyTime" label="申请时间" width="170">
+        <el-table-column prop="applyCount" label="备货数量" min-width="70"></el-table-column>
+        <el-table-column prop="applyTime" label="申请时间" width="140">
           <template v-slot="scope">
             <span>{{ scope.row.applyTime.replace('T', ' ') }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="applyStatus" label="状态" width="100">
+        <el-table-column prop="applyStatus" label="状态" width="75">
           <template v-slot="scope">
-            <el-tag :type="scope.row.applyStatus === 'CANCEL' ? 'danger' : ''">
+            <el-tag :type="scope.row.applyStatus === 'CANCEL' ? 'danger' : (scope.row.applyStatus === 'COMFIRE' ? 'success' : '')">
               {{ getDictLabel(resultList, scope.row.applyStatus) }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="300" fixed="right">
+        <el-table-column label="操作" width="250" fixed="right">
           <template v-slot="scope">
-            <el-button type="primary" class="op-btn" @click="editHandle(scope.row)" v-if="
-              (scope.row.applyStatus === 'NEW')
+            <el-button type="success" class="op-btn" @click="editHandle(scope.row)" size="small" v-if="
+              (scope.row.applyStatus === 'NEW') 
             ">
               修改
             </el-button>
-            <el-button type="primary" class="op-btn" @click="deleteHandleShow(scope.row)" v-if="
+            <el-button type="danger" class="op-btn" @click="deleteHandleShow(scope.row)" size="small" v-if="
               (scope.row.applyStatus === 'NEW')
             ">
               取消
             </el-button>
-            <el-button type="primary" class="op-btn" @click="sureHandle(scope.row)" v-if="
+            <el-button type="primary" class="op-btn" @click="sureHandle(scope.row)" size="small" v-if="
               (scope.row.applyStatus === 'NEW')
             ">
               确认接收
             </el-button>
-            <el-button type="primary" class="op-btn" @click="viewHandle(scope.row)">
+            <el-button type="info" class="op-btn" size="small" @click="viewHandle(scope.row)">
               详情
             </el-button>
           </template>
@@ -98,7 +97,7 @@
     </div>
     <el-dialog v-model="dialogVisible" :title="dialogTitle" width="80%" :show-close="false">
       <AddOrUpdate :ref="(el) => (addUpdateRef = el)" @refreshDataList="getList" @closeHandle="handleClose"
-        :device-type-list="typeList" :device-model-list="modelList" :manufacturer-list="manufacturerList" />
+        :device-type-list="typeList" :device-model-list="modelList" :manufacturer-list="manufacturerList" :storeList="interfaceLowerListArr"/>
     </el-dialog>
     <el-dialog v-model="cancelOrderDialog" width="30%" title="取消订单">
       <el-form ref="cancelOrderFormRef" :model="cancelOrderForm" :rules="{
@@ -153,6 +152,7 @@ import {
 import $storeinitData from '@/store/initData' //引入tab vuex
 import { useRoute } from 'vue-router'
 import { IsPermission } from '@/router/routerUtil'
+import { min } from 'moment'
 //或取路由传入过来的对象数据
 const route = useRoute()
 const tableLoding = ref(false)
@@ -193,6 +193,10 @@ const resultList = computed(() => {
     $storeinitData.state.dictData['INV_APPLY_STATUS'] || []
   )
 })
+const inventoryType = computed(() => {
+  return $storeinitData.state.dictData['INVENTORY_TYPE'] || []
+})
+
 const { tableData, searchForm, selectList, paging, btnLoading } = toRefs(state)
 function handleCurrentChange(val: number) {
   paging.value.currentPage = val
@@ -220,11 +224,8 @@ function getLowerList() {
     console.log(res)
     if (res && res.code === 0) {
       let bizContent = res.data
-      console.log(bizContent)
       let data = bizContent.idNames || [];
       interfaceLowerListArr.value = data
-    } else {
-      ElMessage.error(res.message)
     }
   })
 }
@@ -361,7 +362,7 @@ function addHandle() {
   dialogTitle.value = '调拨申请'
   nextTick(() => {
     addUpdateRef.value.typeOption = 'add'
-    addUpdateRef.value.init()
+    addUpdateRef.value.init(null)
   })
 }
 // 修改设备入库-备货
@@ -473,6 +474,10 @@ function sureMoreHandle() {
     }
   )
 }
+function changeDeviceType() {
+    searchForm.value.version = ''
+    searchForm.value.brand = ''
+}
 // 关闭弹窗
 function handleClose() {
   dialogVisible.value = false