java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

职位及详情页修改

dev
sensen 2 years ago
parent
2592fc2b84
commit
26385c21a7
6 changed files with 61 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  2. 30
      src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
  3. 35
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  4. 4
      src/views/system/UserList.vue
  5. 6
      src/views/waste/ProcessWasteList.vue
  6. 12
      src/views/waste/modules/ProcessWasteForm.vue

17
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
Unescape View File

@ -34,17 +34,20 @@
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料组">
<a-input placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
<!-- <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup" dict=",,"/>-->
<a-select v-model="queryParam.itemGroup" placeholder="请选择" >
<a-select-option v-for="(item,index) in bigId" :key="index" :value="item.itemGroup">{{item.itemGroup}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料">
<a-input placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
<a-input placeholder="请输入物料" v-model="queryParam.item" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料描述">
<a-input placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
<a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription" dict=",,"/>
</a-form-item>
</a-col>
@ -208,6 +211,7 @@
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
export default {
name: 'ProcessSuppliesStrongerList',
mixins:[JeecgListMixin, mixinDevice],
@ -219,9 +223,10 @@
},
data () {
return {
item:false,
// item:false,
description: '物资总库管理页面',
// 表头
bigId:[],
columns: [
{
title: '#',
@ -351,7 +356,7 @@
delete: "/suppliesstronger/processSuppliesStronger/delete",
deleteBatch: "/suppliesstronger/processSuppliesStronger/deleteBatch",
exportXlsUrl: "/suppliesstronger/processSuppliesStronger/exportXls",
importExcelUrl: "suppliesstronger/processSuppliesStronger/importExcel",
importExcelUrl: "/suppliesstronger/processSuppliesStronger/importExcel",
},
dictOptions:{},
@ -399,6 +404,8 @@
fieldList.push({type:'sel_search',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
this.superFieldList = fieldList
}
}
}

30
src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
Unescape View File

@ -23,21 +23,21 @@
<!-- <j-search-select-tag placeholder="请选择供应商描述" v-model="queryParam.supplierDescription" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料组">
<a-input placeholder="请选择物料组" v-model="queryParam.itemGroup" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料">
<a-input placeholder="请选择物料" v-model="queryParam.item" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-form-item label="物料描述">
<a-input placeholder="请选择物料描述" v-model="queryParam.itemDescription" dict=",,"/>
</a-form-item>
</a-col>
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="物料组">-->
<!-- <a-input placeholder="请输入物料组" v-model="queryParam.itemGroup" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="物料">-->
<!-- <a-input placeholder="请输入物料" v-model="queryParam.item" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
<!-- <a-form-item label="物料描述">-->
<!-- <a-input placeholder="请输入物料描述" v-model="queryParam.itemDescription" dict=",,"/>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <template v-if="toggleSearchStatus">-->
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->

35
src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
Unescape View File

@ -5,12 +5,12 @@
<a-row>
<a-col :span="8">
<a-form-item label="流程表单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['processId']" />
<a-input v-decorator="['processId']" placeholder="请输入流程表单号" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierId']" />
<a-input v-decorator="['supplierId']" placeholder="请输入供应商id" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -20,7 +20,11 @@
</a-col>
<a-col :span="8">
<a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['itemGroup']" type="list" :trigger-change="true" placeholder="请输入物料组" />
<!-- <a-input v-decorator="['itemGroup']" type="list" :trigger-change="true" placeholder="请输入物料组" />-->
<a-select v-decorator="['itemGroup']" placeholder="请选择物料组" >
<a-select-option v-for="(item,index) in bigId" :key="index" :value="item.itemGroup">{{item.itemGroup}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="8">
@ -40,27 +44,27 @@
</a-col>
<a-col :span="8">
<a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['amount']" />
<a-input v-decorator="['amount']" placeholder="请输入数量" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="单价（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['price']" />
<a-input v-decorator="['price']" placeholder="请输入单价（元）" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="金额（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['rates']" />
<a-input v-decorator="['rates']" placeholder="请输入金额（元）" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="仓储地点" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['unitWasteWarehouseCodeId']" type="list" :trigger-change="true" placeholder="请输入仓储地点" />
<a-input v-decorator="['unitWasteWarehouseCodeId']" type="list" :trigger-change="true" placeholder="请选择仓储地点" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="存储仓位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['freightSpace']" type="list" :trigger-change="true" placeholder="请输入储存仓位" />
<a-input v-decorator="['freightSpace']" type="list" :trigger-change="true" placeholder="请选择储存仓位" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -75,12 +79,15 @@
</a-col>
<a-col :span="8">
<a-form-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['batch']" type="list" :trigger-change="true" placeholder="请输入批次" />
<a-input v-decorator="['batch']" type="list" :trigger-change="true" placeholder="请选择批次" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="到货情况" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['arrivalNotice']" dict="" />
<!-- <a-input v-decorator="['arrivalNotice']" dict="" placeholder="请选择到货情况"/>-->
<a-select v-decorator="['arrivalNotice']" placeholder="请选择到货情况" >
<a-select-option v-for="(item,index) in bigId" :key="index" :value="item.arrivalNotice">{{item.arrivalNotice}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="8">
@ -90,12 +97,15 @@
</a-col>
<a-col :span="8">
<a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['librarySign']" type="list" :trigger-change="true" placeholder="请输入入库人" />
<!-- <a-input v-decorator="['librarySign']" type="list" :trigger-change="true" placeholder="请选择入库人" />-->
<a-select v-decorator="['librarySign']" placeholder="请选择入库人" >
<a-select-option v-for="(item,index) in bigId" :key="index" :value="item.librarySign">{{item.librarySign}}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="核算属性" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请输入核算属性" />
<a-input v-decorator="['accountingAttributes']" type="list" :trigger-change="true" placeholder="请选择核算属性" />
</a-form-item>
</a-col>
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
@ -148,6 +158,7 @@
return {
form: this.$form.createForm(this),
model: {},
bigId:[],
labelCol: {
xs: { span: 24 },
sm: { span: 5 },

4
src/views/system/UserList.vue
Unescape View File

@ -258,10 +258,10 @@
dataIndex: 'orgCodeTxt'
},
{
title: '负责部门',
title: '职位',
align: "center",
width: 180,
dataIndex: 'departIds_dictText'
dataIndex: 'post'
},
{
title: '状态',

6
src/views/waste/ProcessWasteList.vue
Unescape View File

@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :xl="3" :lg="5" :md="5" :sm="18">
<a-form-item label="物资名称">
<a-input placeholder="请选择物资名称" v-model="queryParam.materialName" dict=",,"/>
<a-input placeholder="请输入物资名称" v-model="queryParam.materialName" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="3" :lg="5" :md="5" :sm="18">
@ -16,7 +16,7 @@
</a-col>
<a-col :xl="3" :lg="5" :md="5" :sm="18">
<a-form-item label="物料码">
<a-input placeholder="请选择物料码" v-model="queryParam.descriptionId" dict=",,"/>
<a-input placeholder="请输入物料码" v-model="queryParam.descriptionId" dict=",,"/>
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
@ -216,7 +216,7 @@
dataIndex: 'brand'
},
{
title:'名称',
title:'物资名称',
align:"center",
dataIndex: 'materialName'
},

12
src/views/waste/modules/ProcessWasteForm.vue
Unescape View File

@ -5,12 +5,12 @@
<a-row>
<a-col :span="8">
<a-form-item label="创建人" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['createBy']" dict="" />
<a-input v-decorator="['createBy']" placeholder="请输入创建人" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="物料码" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['descriptionId']" dict="" />
<a-input v-decorator="['descriptionId']" placeholder="请输入物料码" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -20,7 +20,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="物资名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialName']" dict="" />
<a-input v-decorator="['materialName']" placeholder="请输入物资名称" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -30,7 +30,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['unit']" dict="" />
<a-input v-decorator="['unit']" placeholder="请选择单位" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -40,7 +40,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="存放位置" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['depositary']" dict="" />
<a-input v-decorator="['depositary']" placeholder="请选择存放位置" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">
@ -50,7 +50,7 @@
</a-col>
<a-col :span="8">
<a-form-item label="所属单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['affiliation']" dict="" />
<a-input v-decorator="['affiliation']" placeholder="请选择所属单位" dict="" />
</a-form-item>
</a-col>
<a-col :span="8">

Write Preview
Loading…
Cancel
Save