Browse Source

策略,盘点去掉导入

master
zhang_li 10 months ago
parent
commit
7d3d481ef5
  1. 5
      src/directives/permission/hasRole.ts
  2. 8
      src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
  3. 2
      src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue
  4. 2
      src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue
  5. 4
      src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue
  6. 6
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  7. 8
      src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
  8. 8
      src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue
  9. 3
      src/views/wms/countManage/count/countPlanMain/index.vue

5
src/directives/permission/hasRole.ts

@ -8,7 +8,10 @@ export function hasRole(app: App<Element>) {
const { wsCache } = useCache() const { wsCache } = useCache()
const { value } = binding const { value } = binding
const super_admin = 'admin' const super_admin = 'admin'
const roles = wsCache.get(CACHE_KEY.USER).roles let roles = []
if(wsCache.get(CACHE_KEY.USER)?.roles){
roles = wsCache.get(CACHE_KEY.USER).roles
}
if (value && value instanceof Array && value.length > 0) { if (value && value instanceof Array && value.length > 0) {
const roleFlag = value const roleFlag = value

8
src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@ -146,17 +146,17 @@
:key="index" /> :key="index" />
</el-select> </el-select>
<el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" clearable style="flex: 1;"> <el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
<el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区" clearable style="flex: 1;"> <el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
<el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" clearable style="flex: 1;"> <el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
<el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位" clearable style="flex: 1;"> <el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

2
src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue

@ -98,7 +98,7 @@
<el-select v-model="item.Value" <el-select v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`" :placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
clearable style="flex: 1;"> clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 忽略物品 --> <!-- 忽略物品 -->

2
src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@ -82,7 +82,7 @@
<el-select v-model="item.Value" <el-select v-model="item.Value"
:placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`" :placeholder="`请选择${item.ParamCode == 'WarehouseCode' ? '仓库' : item.ParamCode == 'AreaCode' ? '库区' : item.ParamCode == 'LocationGroupCode' ? '库位组' : item.ParamCode == 'LocationCode' ? '库位' : ''}`"
clearable style="flex: 1;"> clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

4
src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue

@ -173,9 +173,9 @@
> >
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.id" :key="cur.code"
:label="cur.name" :label="cur.name"
:value="cur.id" :value="cur.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>

6
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@ -98,19 +98,19 @@
<el-select v-model="formData.configuration.WarehouseCode" <el-select v-model="formData.configuration.WarehouseCode"
:placeholder="`请选择${formData.configuration.WarehouseCode == 'WarehouseCode' ? '仓库' : formData.configuration.WarehouseCode== 'AreaCode' ? '库区' : formData.configuration.WarehouseCode == 'LocationGroupCode' ? '库位组' : formData.configuration.WarehouseCode == 'LocationCode' ? '库位' : ''}`" :placeholder="`请选择${formData.configuration.WarehouseCode == 'WarehouseCode' ? '仓库' : formData.configuration.WarehouseCode== 'AreaCode' ? '库区' : formData.configuration.WarehouseCode == 'LocationGroupCode' ? '库位组' : formData.configuration.WarehouseCode == 'LocationCode' ? '库位' : ''}`"
clearable> clearable>
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 月台 --> <!-- 月台 -->
<el-form-item label="月台" prop="DockCode" > <el-form-item label="月台" prop="DockCode" >
<el-select v-model="formData.configuration.DockCode" placeholder="请选择月台" clearable> <el-select v-model="formData.configuration.DockCode" placeholder="请选择月台" clearable>
<el-option v-for="cur in options.dockList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.dockList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 在途库位 --> <!-- 在途库位 -->
<el-form-item label="在途库位" prop="OnTheWayLocationCode" > <el-form-item label="在途库位" prop="OnTheWayLocationCode" >
<el-select v-model="formData.configuration.OnTheWayLocationCode" placeholder="请选择在途库位" clearable> <el-select v-model="formData.configuration.OnTheWayLocationCode" placeholder="请选择在途库位" clearable>
<el-option v-for="cur in options.locationList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.locationList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

8
src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@ -148,17 +148,17 @@
:key="index" /> :key="index" />
</el-select> </el-select>
<el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" clearable style="flex: 1;"> <el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
<el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区" clearable style="flex: 1;"> <el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
<el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" clearable style="flex: 1;"> <el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
<el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位" clearable style="flex: 1;"> <el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位" clearable style="flex: 1;">
<el-option v-for="cur in options.warehouseList" :key="cur.id" :label="cur.name" :value="cur.id" /> <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

8
src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue

@ -85,9 +85,9 @@
> >
<el-option <el-option
v-for="cur in options.warehouseList" v-for="cur in options.warehouseList"
:key="cur.id" :key="cur.code"
:label="cur.name" :label="cur.name"
:value="cur.id" :value="cur.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -124,9 +124,9 @@
> >
<el-option <el-option
v-for="cur in options.overflowWarehouseList" v-for="cur in options.overflowWarehouseList"
:key="cur.id" :key="cur.code"
:label="cur.name" :label="cur.name"
:value="cur.id" :value="cur.code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>

3
src/views/wms/countManage/count/countPlanMain/index.vue

@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods
// //
const HeadButttondata = [ const HeadButttondata = [
defaultButtons.defaultAddBtn({hasPermi:'wms:count-plan-main:create'}), // defaultButtons.defaultAddBtn({hasPermi:'wms:count-plan-main:create'}), //
defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), // // defaultButtons.defaultImportBtn({hasPermi:'wms:count-plan-main:import'}), //
defaultButtons.defaultExportBtn({hasPermi:'wms:count-plan-main:export'}), // defaultButtons.defaultExportBtn({hasPermi:'wms:count-plan-main:export'}), //
defaultButtons.defaultFreshBtn(null), // defaultButtons.defaultFreshBtn(null), //
defaultButtons.defaultFilterBtn(null), // defaultButtons.defaultFilterBtn(null), //
@ -362,6 +362,5 @@ const selectChange = (field,val)=>{
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
getList() getList()
importTemplateData.templateUrl = await CountPlanMainApi.importTemplate()
}) })
</script> </script>

Loading…
Cancel
Save