Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
9891773390
  1. 15
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
  2. 4
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
  3. 8
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
  4. 19
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
  5. 8
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
  6. 11
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
  7. 14
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue
  8. 26
      anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue
  9. 25
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue
  10. 38
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

15
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@ -100,27 +100,27 @@
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span>常用配置</span>
</el-col>
<el-col :span="13" class="trightb tlineheightb">
<el-form-item>{{ formobj.configName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span>内部编码</span>
</el-col>
<el-col :span="5">
<el-col :span="5" class="trightb tlineheightb">
<el-form-item>
<span>{{ formobj.insideCode }}</span>
{{ formobj.insideCode }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>车辆型号</span>
<span><span class="icon">*</span>车辆型号</span>
</el-col>
<el-col :span="5">
<el-form-item>
<el-form-item prop="vehMark">
<el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
</el-form-item>
</el-col>
@ -450,7 +450,8 @@ export default {
isSaleOrgApproval: [{ required: true, message: '是否销售部审批不能为空', trigger: 'change' }], //
purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], //
num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], //
deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] //
deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], //
vehMark: [{ required: true, message: '车辆型号不能为空', trigger: 'blur' }] //
}
}
},

4
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue

@ -58,13 +58,13 @@
</el-row>
<el-row>
<el-col :span="3" class="tleftb">常用配置</el-col>
<el-col :span="13" class="trightb tlineheightb">
<el-col :span="13" class="tlineheightb">
<el-form-item><span>{{ formobj.configName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>内部编码</span>
</el-col>
<el-col :span="5">
<el-col :span="5" class="tlineheightb">
<el-form-item>
<span>{{ formobj.insideCode }}</span>
</el-form-item>

8
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@ -60,16 +60,14 @@
</el-row>
<el-row>
<el-col :span="3" class="tleftb">常用配置</el-col>
<el-col :span="13" class="trightb tlineheightb">
<el-col :span="13" class="tlineheightb">
<el-form-item><span>{{ formobj.configName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>内部编码</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.insideCode }}</span>
</el-form-item>
<el-col :span="5" class="tlineheightb">
<el-form-item><span>{{ formobj.insideCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>

19
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue

@ -99,27 +99,25 @@
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span><span class="icon">*</span>常用配置</span>
</el-col>
<el-col :span="13" class="trightb tlineheightb">
<el-col :span="13" class="tlineheightb">
<el-form-item>{{ formobj.configName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<el-col :span="3" class="tleftb" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">
<span>内部编码</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.insideCode }}</span>
</el-form-item>
<el-col :span="5" class="tlineheightb">
<el-form-item>{{ formobj.insideCode }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>车辆型号</span>
<span><span class="icon">*</span>车辆型号</span>
</el-col>
<el-col :span="5">
<el-form-item>
<el-form-item prop="vehMark">
<el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
</el-form-item>
</el-col>
@ -461,7 +459,8 @@ export default {
purchasePrice: [{ required: true, message: '采购价格不能为空', trigger: 'blur' }], //
isSaleOrgApproval: [{ required: true, message: '是否销售部审批不能为空', trigger: 'change' }], //
num: [{ required: true, message: '台数不能为空', trigger: 'blur' }], //
deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }] //
deposit: [{ required: true, message: '订金不能为空', trigger: 'blur' }], //
vehMark: [{ required: true, message: '车辆型号不能为空', trigger: 'blur' }], //
}
}
},

8
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue

@ -53,16 +53,14 @@
</el-row>
<el-row>
<el-col :span="3" class="tleftb">常用配置</el-col>
<el-col :span="13" class="trightb tlineheightb">
<el-col :span="13" class="tlineheightb">
<el-form-item><span>{{ formobj.configName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>内部编码</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ formobj.insideCode }}</span>
</el-form-item>
<el-col :span="5" class="tlineheightb">
<el-form-item><span>{{ formobj.insideCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>

11
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@ -6,7 +6,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="100px">
<el-form :inline="true" class="tab-header" label-width="110px">
<el-form-item label="订单编号">
<el-input v-model="queryParams.params.orderNo" placeholder="请输入编号" clearable/>
</el-form-item>
@ -21,6 +21,9 @@
<el-form-item label="车型" class="search_label">
<el-input v-model="queryParams.params.modelName" placeholder="请输入车型" clearable/>
</el-form-item>
<el-form-item label="排产申请编号" class="search_label">
<el-input v-model="queryParams.params.applicationCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="queryParams.params.startDate" type="date" placeholder="选择日期">
</el-date-picker>
@ -145,7 +148,8 @@ export default {
endDate: '',
modelName: '',
staffSid: window.sessionStorage.getItem('staffSid'),
userSid: window.sessionStorage.getItem('userSid')
userSid: window.sessionStorage.getItem('userSid'),
applicationCode: ''
}
},
row: {}
@ -228,7 +232,8 @@ export default {
endDate: '',
modelName: '',
staffSid: window.sessionStorage.getItem('staffSid'),
userSid: window.sessionStorage.getItem('userSid')
userSid: window.sessionStorage.getItem('userSid'),
applicationCode: ''
}
}
this.dosearch()

14
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@ -9,6 +9,9 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="120px">
<el-form-item label="排产申请编号:">
<el-input v-model="queryParams.params.pcApplicationCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购订单编号:">
<el-input v-model="queryParams.params.purchaseOrderNo" placeholder="" clearable/>
</el-form-item>
@ -45,14 +48,15 @@
<el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="状态" header-align="center">
<el-table-column label="状态" header-align="center" width="100">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="applicationDate" label="申请日期" align="center" width="100"/>
<el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="200"/>
<el-table-column prop="pcApplicationCode" label="排产申请编号" align="center" width="170"/>
<el-table-column prop="purchaseOrderNo" label="采购订单编号" align="center" width="170"/>
<el-table-column prop="modelName" label="车型" align="center"/>
<el-table-column prop="vehicleNum" fit label="台数" align="center" width="60"/>
<el-table-column prop="contractPrice" fit label="厂家合同价" align="center" width="130"/>
@ -129,7 +133,8 @@ export default {
nodeState: '',
purchaseOrderNo: '',
modelName: '',
createOrgSid: ''
createOrgSid: '',
pcApplicationCode: ''
}
},
row: {}
@ -230,7 +235,8 @@ export default {
nodeState: '',
purchaseOrderNo: '',
modelName: '',
createOrgSid: ''
createOrgSid: '',
pcApplicationCode: ''
}
}
this.init()

26
anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@ -13,28 +13,24 @@
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="打款状态">
<el-select v-model="listQuery.params.paymentState" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="认款日期">
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<div style="float: left;margin: 0px 10px"></div>
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
</el-form-item>
<el-form-item label="申请编号">
<el-input v-model="listQuery.params.proSchAppNo" placeholder="请输入排产申请编号" clearable/>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable class="addinputw">
<el-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable>
<el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="打款状态">
<el-select v-model="listQuery.params.paymentState" placeholder="请选择" clearable>
<el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="认款日期">
<el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>

25
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichan.vue

@ -7,8 +7,11 @@
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="100px">
<el-form-item :model="queryParams" label="申请日期">
<el-form :inline="true" :model="queryParams" class="tab-header" label-width="100px">
<el-form-item label="申请编号">
<el-input v-model="queryParams.params.applicationCode" clearable placeholder=""/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateStart" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
<div class="line"></div>
<el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.params.applicationDateEnd" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
@ -45,19 +48,19 @@
<el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="状态" width="150px" header-align="center">
<el-table-column label="状态" width="90" align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column width="150" prop="applyType" label="采购类型" align="center"/>
<el-table-column width="150" prop="schedulingType" label="采购原因" align="center"/>
<el-table-column width="200" prop="applicationCode" label="申请编号" align="center"/>
<el-table-column width="150" prop="applicationDate" label="申请日期" align="center"/>
<el-table-column width="170" prop="applicationCode" label="申请编号" align="center"/>
<el-table-column width="100" prop="applicationDate" label="申请日期" align="center"/>
<el-table-column width="100" prop="applyType" label="采购类型" align="center"/>
<el-table-column width="100" prop="schedulingType" label="采购原因" align="center"/>
<el-table-column width="150" prop="createOrgName" label="分公司" align="center"/>
<el-table-column width="150" prop="createByName" label="申请人" align="center"/>
<el-table-column width="150" prop="applyForDeposit" label="申请订金" align="center"/>
<el-table-column width="90" prop="createByName" label="申请人" align="center"/>
<el-table-column width="100" prop="applyForDeposit" label="申请订金" align="center"/>
<el-table-column prop="remarks" fit label="备注" align="left" header-align="center"/>
</el-table>
</div>
@ -149,6 +152,7 @@ export default {
size: 10,
total: 0,
params: {
applicationCode: '',
applicationDateStart: '',
applicationDateEnd: '',
applyTypeKey: '',
@ -269,7 +273,8 @@ export default {
size: 10,
total: 0,
params: {
applicationDateStart: '',
applicationCode: '',
applicationDateStart: '',
applicationDateEnd: '',
applyTypeKey: '',
schedulingTypeKey: '',

38
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@ -16,9 +16,22 @@
<el-date-picker v-model="listQuery.params.applyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="车架号">-->
<!-- <el-input v-model="listQuery.params.vin" placeholder="请输入名称" clearable/>-->
<!-- </el-form-item>-->
<el-form-item label="申请编号">
<el-input v-model="listQuery.params.applyId" placeholder="" clearable/>
</el-form-item>
<el-form-item label="现存放地点">
<el-select v-model="listQuery.params.locationSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in warehouwarehouse_list" :key="item.sid" :label="item.dictValue" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="目标存放地点">
<el-select v-model="listQuery.params.targetLocationSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in warehouwarehouse_list" :key="item.sid" :label="item.dictValue" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="经办人">
<el-input v-model="listQuery.params.operator" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
@ -45,7 +58,7 @@
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="180px" prop="state" label="状态" header-align="center" align="left">
<el-table-column width="100px" prop="state" label="状态" header-align="center" align="left">
<template slot-scope="scope">
<span v-if="scope.row.state=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{ scope.row.state }}</span>
@ -262,7 +275,8 @@ import {
selectCarTransferList,
temporaryExitPermitInfo,
getErtraState,
saveCarTransferSiteImage
saveCarTransferSiteImage,
selectWarehouseByUserSid
} from '@/api/supplychain/cunfangdidianbiangeng'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import ButtonBar from '@/components/ButtonBar'
@ -293,6 +307,7 @@ export default {
isSearchShow: false,
tableLoading: false,
dialogImgVisible: false,
warehouwarehouse_list: [], //
formobj: {
sid: '',
userSid: '',
@ -321,6 +336,10 @@ export default {
applyDateStart: '',
applyDateEnd: '',
vin: '',
applyId: '',
targetLocationSid: '',
locationSid: '',
operator: '',
userSid: window.sessionStorage.getItem('userSid')
}
},
@ -549,6 +568,10 @@ export default {
applyDateStart: '',
applyDateEnd: '',
vin: '',
applyId: '',
targetLocationSid: '',
locationSid: '',
operator: '',
userSid: window.sessionStorage.getItem('userSid')
}
}
@ -626,6 +649,11 @@ export default {
this.modelName_list = response.data
}
})
selectWarehouseByUserSid(window.sessionStorage.getItem('userSid')).then((res) => {
if (res.success) {
this.warehouwarehouse_list = res.data
}
})
},
// sid
getUseOrg() {

Loading…
Cancel
Save