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

总库新增

dev
caoyizhong 2 years ago
parent
58c0955f92
commit
a0b142dddd
3 changed files with 260 additions and 68 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. 49
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  2. 232
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  3. 47
      src/views/wastematerials/ProcessWasteMaterialsList.vue

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

@ -33,7 +33,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('物资总库')" v-has="'suppliesstronger:export'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'suppliesstronger:import'">导入</a-button>
@ -41,12 +41,12 @@
<a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/总库导入模板_1669801840316.xlsx')" v-has="'suppliesstronger:import'">总库导入模板</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item> <a-icon type="down" />-->
<!-- </a-menu> -->
<a-button style="margin-left: 8px" @click="batchDell"><a-icon type="delete"/> 删除 </a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
@ -114,7 +114,7 @@
import JDate from '@/components/jeecg/JDate.vue'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import { getAction } from '@api/manage'
import { deleteAction, getAction } from '@api/manage'
export default {
@ -239,6 +239,41 @@
},
},
methods: {
batchDell(){
if(!this.url.deleteBatch){
this.$message.error("请设置url.deleteBatch属性!!!!")
return
}
if (this.selectedRowKeys.length <= 0) {
this.$message.warning('请选择一条记录！');
return;
} else {
var ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
var that = this;
this.$confirm({
title: "确认删除",
content: "是否删除选中数据?",
onOk: function () {
that.loading = true;
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
that.$message.success(res.message);
that.loadData();
that.onClearSelected();
} else {
that.$message.warning(res.message);
}
}).finally(() => {
that.loading = false;
});
}
});
}
},
async loadData (arg) {
if(!this.url.list){
this.$message.error("请设置url.list属性!")

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

@ -3,14 +3,14 @@
<j-form-container :disabled="formDisabled">
<a-form :form="form" slot="detail">
<a-row>
<a-col :span="8">
<a-form-item label="流程表单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<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="['processId']" placeholder="请输入流程表单号" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :span="8">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierId']" placeholder="请输入供应商" />
<a-input v-decorator="['supplierId']" placeholder="请输入供应商" disabled/>
</a-form-item>
</a-col>
<!-- <a-col :span="8">-->
@ -20,16 +20,40 @@
<!-- </a-col>-->
<a-col :span="8">
<a-form-item label="物料组" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['descriptionId']" type="list" :trigger-change="true" placeholder="请输入物料组" />
<a-input v-decorator="['descriptionId']" type="list" :trigger-change="true" placeholder="请输入物料组" disabled />
<!-- <a-select v-decorator="['descriptionId']" 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">
<a-form-item label="物料号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialsNumber']" type="list" :trigger-change="true" placeholder="请输入物料组" disabled />
<!-- <a-select v-decorator="['descriptionId']" 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">
<a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['merchandiseNewsId']" type="list" :trigger-change="true" placeholder="请输入物料" />
<!-- <a-input v-decorator="['merchandiseNewsId']" type="list" :trigger-change="true" placeholder="请输入物料" @change="getActions" />-->
<a-select
show-search
placeholder="请输入物料名称"
option-filter-prop="children"
style="width: 273px "
@search="getActions($event)"
@focus="handleFocus"
@blur="handleBlur"
@change="handleChange"
v-decorator="['merchandiseNewsId',validatorRules.merchandiseNewsId]"
>
<a-select-option v-for="(item,index) in bigId" :key="index" :value="item.id">{{item.merchandiseName}} </a-select-option>
<!-- :filter-option="filterOption"-->
</a-select>
</a-form-item>
</a-col>
<!-- <a-col :span="8">-->
@ -39,34 +63,39 @@
<!-- </a-col>-->
<a-col :span="8">
<a-form-item label="计量单位（只 ）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['unitMeasurement']" 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="['materialQuantity']" placeholder="请输入数量" />
<a-input v-decorator="['unitMeasurement']" type="list" :trigger-change="true" placeholder="请输入计量单位" disabled />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="单价（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialPrice']" placeholder="请输入单价（元）" />
<a-form-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierBatch']" 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="['rates']" placeholder="请输入金额（元）" />
<a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialQuantity',validatorRules.materialQuantity]" placeholder="请输入数量" @change="getNum" />
</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-form-item label="单价（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialPrice',validatorRules.materialPrice]" placeholder="请输入单价（元）" @change="getPrice" />
</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-form-item label="金额（元）" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['rates']" placeholder="请输入金额（元）" disabled />
</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-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-form-item>-->
<!-- </a-col>-->
<a-col :span="8">
<a-form-item label="生产时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择生产时间" v-decorator="['productionTime']" :trigger-change="true" style="width: 100%" />
@ -74,38 +103,38 @@
</a-col>
<a-col :span="8">
<a-form-item label="保质期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请选择保质期" v-decorator="['expirationDate']" :trigger-change="true" />
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="批次" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['supplierBatch']" 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="" 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">
<a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择入库时间" v-decorator="['storageTime']" :trigger-change="true" style="width: 100%" />
</a-form-item>
</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-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-input placeholder="请填写保质期" v-decorator="['expirationDate']" :trigger-change="true" />
</a-form-item>
</a-col>
<!-- <a-col :span="8">-->
<!-- <a-form-item label="到货情况" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!--&lt;!&ndash; <a-input v-decorator="['arrivalNotice']" dict="" placeholder="请选择到货情况"/>&ndash;&gt;-->
<!-- <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">-->
<!-- <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <j-date placeholder="请选择入库时间" v-decorator="['storageTime']" :trigger-change="true" style="width: 100%" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-form-item label="入库人" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input v-decorator="['librarySign']" :trigger-change="true" placeholder="请输入入库人" />-->
<!--&lt;!&ndash; <a-select v-decorator="['librarySign']" placeholder="请选择入库人" >&ndash;&gt;-->
<!--&lt;!&ndash; <a-select-option v-for="(item,index) in bigId" :key="index" :value="item.librarySign">{{item.librarySign}}</a-select-option>&ndash;&gt;-->
<!--&lt;!&ndash; </a-select>&ndash;&gt;-->
<!-- </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-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['accountingAttributes',validatorRules.accountingAttributes]"
:trigger-change="true" dictCode="material_type"
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">
@ -161,20 +190,38 @@
bigId:[],
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
sm: { span: 7 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/suppliesstronger/processSuppliesStronger/add",
edit: "/suppliesstronger/processSuppliesStronger/edit",
queryById: "/suppliesstronger/processSuppliesStronger/queryById"
}
queryById: "/suppliesstronger/processSuppliesStronger/queryById",
merchandiseNewsList: '/merchandisenews/processMerchandiseNews/merchandiseNewsList',
},
// 表单校验
validatorRules: {
// 'blur'是鼠标失去焦点的时候会触发验证
accountingAttributes: { rules: [{ required: true, message: '请选择物资类型!' }] },
merchandiseNewsId: { rules: [{ required: true, message: '请选择需求时间!' }] },
materialQuantity: { rules: [{ required: true, message: '请输入数量!' }] },
materialPrice: { rules: [{ required: true, message: '请输入单价!' }] },
// productionTime: { rules: [{ required: true, message: '请选择生产时间!' }] },
// needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
// needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
// needTime: { rules: [{ required: true, message: '请选择需求时间!' }] },
// processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] },
// sort: {
// rules: [{ required: true, type: 'number', max: 999999999999, message: '请输入序号!(0 ~ 12个数字)' }
// // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'}
// // {validator: this.lengthCheck}
// ]
// }
},
}
},
computed: {
@ -199,8 +246,81 @@
created () {
//如果流程中表单，则需要加载流程表单data
this.showFlowData();
this.getActions();
},
methods: {
//选择触发
handleChange(value) {
// console.log(`selected ${value}`);
this.bigId.forEach(item => {
if(item.id === value){
this.form.setFieldsValue({
descriptionId: item.materialClassify,
supplierId: item.supplierId,
unitMeasurement:item.materialsUnit,
materialsNumber : item.materialsNumber,
})
}
});
},
handleBlur() {
console.log('blur');
},
handleFocus() {
console.log('focus');
},
filterOption(input, option) {
return (
option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
);
},
getNum(e){
var sVal = e.target.value
// console.log("数量",sVal);
this.form.validateFields((err, values) => {
// 这里做逻辑处理
console.log(values.materialPrice) // { username: '' }
if(!!values.materialPrice){
this.form.setFieldsValue({
rates: values.materialPrice * sVal
})
}
})
},
getPrice(e){
var sVal = e.target.value
// console.log("价格",sVal);
this.form.validateFields((err, values) => {
// 这里做逻辑处理
console.log(values.materialQuantity); // { username: '' }
if(!!values.materialQuantity){
this.form.setFieldsValue({
rates: values.materialQuantity * sVal
})
}
})
},
//商品信息
getActions(e){
// var sVal = e.target.value
// console.log("row",e);
if(!!e){
let par = {
delFlag: 0,
materialsNumber: e,
// id: id
}
getAction(this.url.merchandiseNewsList, par).then((res) => {
console.log('12312', res.result);
if (res.success) {
this.bigId = res.result;
}
})
}
},
add () {
this.edit({});
},

47
src/views/wastematerials/ProcessWasteMaterialsList.vue
Unescape View File

@ -39,6 +39,7 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('账外物资库')" v-has="'wastematerials:export'">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import" v-has="'wastematerials:import'">导入</a-button>
@ -46,12 +47,12 @@
<a-button type="primary" icon="download" @click="downloadFile('http://182.92.73.21:9090/file/temp/账外导入模板_1672371645321.xlsx')" v-has="'wastematerials:import'">帐外导入模板</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">-->
<a-dropdown v-if="selectedRowKeys.length > 0">
<!-- <a-menu slot="overlay">-->
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!-- </a-menu>-->
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
<!-- </a-dropdown>-->
<a-button style="margin-left: 8px" @click="batchDell"> <a-icon type="delete"/> 删除 </a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
@ -126,7 +127,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProcessWasteMaterialsModal from '@views/wastematerials/modules/ProcessWasteMaterialsModal'
import JDate from '@/components/jeecg/JDate.vue'
import { httpAction, getAction } from '@/api/manage'
import { httpAction, getAction, deleteAction } from '@/api/manage'
import JSuperQuery from '@/components/jeecg/JSuperQuery.vue'
import ProcessWasteMaterialsLists from '@views/wastematerials/ProcessWasteMaterialsLists'
import { ajaxGetDictItems, getDictItemsFromCache } from '@api/api'
@ -221,7 +222,7 @@
url: {
list: "/wastematerials/processWasteMaterials/list",
delete: "/wastematerials/processWasteMaterials/delete",
deleteBatch: "/wastematerials/processWasteMaterials/deleteBatch",
// deleteBatch: "/wastematerials/processWasteMaterials/deleteBatch",
exportXlsUrl: "/wastematerials/processWasteMaterials/ownExportXls",
importExcelUrl: "/wastematerials/processWasteMaterials/importExcel",
userRoleUrl: "/sys/user/queryUserRolePart",
@ -248,6 +249,42 @@
},
},
methods: {
batchDell(){
if(!this.url.deleteBatch){
this.$message.error("请设置url.deleteBatch属性!!!!")
return
}
if (this.selectedRowKeys.length <= 0) {
this.$message.warning('请选择一条记录！');
return;
} else {
var ids = "";
for (var a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ",";
}
var that = this;
this.$confirm({
title: "确认删除",
content: "是否删除选中数据?",
onOk: function () {
that.loading = true;
deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
if (res.success) {
that.$message.success(res.message);
that.loadData();
that.onClearSelected();
} else {
that.$message.warning(res.message);
}
}).finally(() => {
that.loading = false;
});
}
});
}
},
//加載項目部
getUnit(){
getAction(this.url.listByuntil).then((res) => {

Write Preview
Loading…
Cancel
Save