yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
product
chuang 2 years ago
parent 17d805ef72 f1336f17a8
commit e8a0b0eaee
4 changed files with 135 additions and 125 deletions
Show Stats Download Patch File Download Diff File

2
SC-web/src/views/login/index.scss
Unescape View File

@ -273,4 +273,4 @@
text-align: left;
margin-left: 110px;
}
}
}

177
SC-web/src/views/scm/basicInformation/poundlist/Form.vue
Unescape View File

@ -2,7 +2,7 @@
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
width="1500px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
@ -16,7 +16,7 @@
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="物料名称"
prop="materialId" >
<popupSelect v-model="dataForm.materialId"
@ -26,29 +26,32 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="销售合同"
prop="salesId" >
<popupSelect v-model="dataForm.salesId"
placeholder="请选择销售合同" clearable field="salesId" interfaceId="381038993740949317" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="salesSelect"
>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="客户名称"
prop="customerId" >
<popupSelect v-model="dataForm.customerId"
placeholder="请选择客户名称" clearable field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="customerSelect"
popupTitle="选择数据" popupWidth="800px" @change="customerSelect" :disabled="true"
>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销售合同"
prop="salesId" >
<popupSelect v-model="dataForm.salesId"
placeholder="请选择销售合同" clearable field="salesId" interfaceId="381038993740949317" :columnOptions="salesIdcolumnOptions" propsValue="id" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px"
>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="车牌号"
prop="vehicleId" >
<popupSelect v-model="dataForm.vehicleId"
@ -68,7 +71,7 @@
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="磅单日期"
prop="poundDate" >
<el-date-picker v-model="dataForm.poundDate"
@ -77,7 +80,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="磅单号"
prop="poundlistNo" >
<el-input v-model="dataForm.poundlistNo"
@ -86,7 +89,28 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="单位"
prop="unit" >
<el-select v-model="unit"
placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="运输类型"
prop="transportType" >
<el-select v-model="transportType"
placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" >
<el-form-item label="皮重"
prop="tareWeight" >
<el-input-number v-model="dataForm.tareWeight"
@ -95,7 +119,7 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="毛重"
prop="grossWeight" >
<el-input-number v-model="dataForm.grossWeight"
@ -104,7 +128,7 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="扣重"
prop="buckleWeight" >
<el-input-number v-model="dataForm.buckleWeight"
@ -113,7 +137,7 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="净重"
prop="netWeight" >
<el-input-number v-model="dataForm.netWeight"
@ -122,27 +146,8 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="单位"
prop="unit" >
<el-select v-model="unit"
placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="运输类型"
prop="transportType" >
<el-select v-model="transportType"
placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="是否垫资"
prop="advance" >
<el-select v-model="advance"
@ -152,7 +157,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="运费"
prop="transportPrice" >
<el-input-number v-model="dataForm.transportPrice"
@ -161,16 +166,16 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="销售价格"
prop="salesPrice" >
<el-input-number v-model="dataForm.salesPrice"
<el-input-number v-model="dataForm.salesPrice"
placeholder="数字文本" :step="1" :style='{"width":"100%"}'>
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="业务员"
prop="businessId" >
<popupSelect v-model="dataForm.businessId"
@ -181,7 +186,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="自然人"
prop="naturalId" >
<popupSelect v-model="dataForm.naturalId"
@ -192,7 +197,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="采购合同"
prop="purchaseId" >
<popupSelect v-model="dataForm.purchaseId"
@ -203,7 +208,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="供应商名称"
prop="supplierName" >
<el-input v-model="dataForm.supplierName"
@ -212,7 +217,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="结算重量"
prop="settlement" >
<el-input-number v-model="dataForm.settlement"
@ -221,7 +226,7 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-col :span="6" >
<el-form-item label="采购单价"
prop="purchasePrice" >
<el-input-number v-model="dataForm.purchasePrice"
@ -230,42 +235,42 @@
</el-input-number>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="进项票日期"
prop="inputDate" >
<el-date-picker v-model="dataForm.inputDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<!-- <el-col :span="6" >-->
<!-- <el-form-item label="进项票日期"-->
<!-- prop="inputDate" >-->
<!-- <el-date-picker v-model="dataForm.inputDate"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >-->
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="销项票日期"
prop="outputDate" >
<el-date-picker v-model="dataForm.outputDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6" >-->
<!-- <el-form-item label="销项票日期"-->
<!-- prop="outputDate" >-->
<!-- <el-date-picker v-model="dataForm.outputDate"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >-->
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="付款日期"
prop="payDate" >
<el-date-picker v-model="dataForm.payDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6" >-->
<!-- <el-form-item label="付款日期"-->
<!-- prop="payDate" >-->
<!-- <el-date-picker v-model="dataForm.payDate"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >-->
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12" >
<el-form-item label="回款日期"
prop="paymentDate" >
<el-date-picker v-model="dataForm.paymentDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" >-->
<!-- <el-form-item label="回款日期"-->
<!-- prop="paymentDate" >-->
<!-- <el-date-picker v-model="dataForm.paymentDate"-->
<!-- placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >-->
</el-date-picker>
</el-form-item>
</el-col>
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" >
<el-form-item label="备注"
prop="remark" >
@ -448,7 +453,7 @@
},
materialIdcolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"item_name"}, {"label":"单位","value":"primary_unit_of_measure"}, {"label":"默认入库区","value":"in_area"}, {"label":"默认出库区","value":"out_area"},],
customerIdcolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"地址","value":"address"}, {"label":"银行账号","value":"bank_account"},],
salesIdcolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商/客户名称","value":"name"},],
salesIdcolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商ID","value":"code"},{"label":"客户名称","value":"name"},],
vehicleIdcolumnOptions:[ {"label":"车牌号","value":"ticketno"}, {"label":"司机","value":"drivername"}, {"label":"车辆照片","value":"vehiclephotos"}, {"label":"手机号","value":"contact"},],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
transportTypeOptions:[{"fullName":"汽运","id":"0"},{"fullName":"船运","id":"1"},{"fullName":"火车","id":"2"}],
@ -474,6 +479,10 @@
advanceChange(e){
this.dataForm.advance = e;
},
salesSelect(j,k){
this.dataForm.supplierNm = k.name;
this.dataForm.customerId = k.bid;
},
purchaseSelect(j,k){
this.dataForm.supplierName = k.name;
this.dataForm.supplierId = k.code;

65
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
Unescape View File

@ -13,7 +13,7 @@
</el-upload>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="物料名称" prop="materialId">
<popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable field="materialId"
interfaceId="381037852907038533" :columnOptions="materialIdcolumnOptions" propsValue="id"
@ -23,7 +23,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="客户名称" prop="customerId">
<popupSelect v-model="dataForm.customerId" placeholder="请选择客户" clearable field="customerId"
interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id"
@ -33,7 +33,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="销售合同" prop="salesId">
<popupSelect v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
interfaceId="396203872441416837" :columnOptions="salesIdcolumnOptions" propsValue="id"
@ -43,7 +43,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="车牌号" prop="vehicleId">
<popupSelect v-model="dataForm.vehicleId" placeholder="请选择车辆" clearable field="vehicleId"
interfaceId="381432451370615173" :columnOptions="vehicleIdcolumnOptions" propsValue="id"
@ -60,7 +60,7 @@
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="磅单时间" prop="poundDate">
<el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp">
@ -68,52 +68,53 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="磅单号" prop="poundlistNo">
<el-input v-model="dataForm.poundlistNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="单位 " prop="unit">
<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运输类型" prop="transportType">
<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="单位 " prop="unit">
<el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
:disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="运输类型" prop="transportType">
<el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
<el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
:value="item.id" :disabled="item.disabled"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="是否垫资" prop="advance">
<el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange">
<el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
@ -122,17 +123,17 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="业务员" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
@ -142,7 +143,7 @@
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="6">
<el-form-item label="自然人" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"

16
SC-web/src/views/scm/basicInformation/vehicle/index.vue
Unescape View File

@ -44,11 +44,11 @@
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="center" align="center" />
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="id" label="ID" width="0" align="left" fixed="center" sortable/>
<el-table-column prop="ticketno" label="车牌号" width="0" align="center" fixed="left" sortable/>
<el-table-column prop="drivername" label="司机" width="0" align="center" sortable/>
<el-table-column prop="vehiclephotos" label="车辆照片" width="0" align="center" sortable>
<el-table-column prop="ticketno" label="车牌号" width="220" align="center" fixed="left" sortable/>
<el-table-column prop="drivername" label="司机" width="220" align="center" sortable/>
<el-table-column prop="vehiclephotos" label="车辆照片" width="350" align="center" sortable >
<template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.vehiclephotos)" :key="index">
<el-popover placement="bottom" trigger="click" width="1000">
@ -63,10 +63,10 @@
</span>
</template>
</el-table-column>
<el-table-column prop="contact" label="手机号" width="0" align="center" sortable/>
<el-table-column prop="creatorusername" label="录入人" width="0" align="center" sortable/>
<el-table-column prop="creatortime" label="创建时间" width="0" align="center" sortable/>
<el-table-column label="操作" fixed="right" width="100">
<el-table-column prop="contact" label="手机号" width="220" align="center" sortable/>
<el-table-column prop="creatorusername" label="录入人" width="220" align="center" sortable/>
<el-table-column prop="creatortime" label="创建时间" width="220" align="center" sortable/>
<el-table-column label="操作" fixed="right" width="130">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>

Write Preview
Loading…
Cancel
Save