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

修改采购单价位置

dev
caoyizhong 2 years ago
parent
d23c41dec9
commit
93fe20b449
10 changed files with 167 additions and 120 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. 2
      src/views/activiti/ProcessModelList.vue
  2. 2
      src/views/activiti/ProcessUserModelList.vue
  3. 13
      src/views/activiti/Schedule.vue
  4. 199
      src/views/activiti/applyHome.vue
  5. 4
      src/views/activiti/form/ProcessUdgetPlan.vue
  6. 28
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  7. 12
      src/views/merchandisenews/ProcessMerchandiseNewsList.vue
  8. 10
      src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
  9. 10
      src/views/suppliesstronger/modules/ProcessSuppliesStrongerForm.vue
  10. 7
      src/views/system/DepartList.vue

2
src/views/activiti/ProcessModelList.vue
Unescape View File

@ -78,7 +78,7 @@
style="color: rgb(144,96,255);">启用</a>
<a href="javascript:void(0);" v-if="record.status==1" @click="editStatus(0,record)"
style="color: #cb892d">禁用</a>
<span v-if="record.name=='预算计划采购流程' || record.name=='权限授权流程' || record.name=='民爆采购流程' ">
<span v-if="record.name == '权限授权流程' ">
<a-divider type="vertical"/>
<a href="javascript:void(0);" @click="getNodeData(record)">审批人员</a>
</span>

2
src/views/activiti/ProcessUserModelList.vue
Unescape View File

@ -73,7 +73,7 @@
<span> {{filterDictText(dictOptions, text)}} </span>
</span>
<span slot="make" slot-scope="text, record">
<div v-if="record.name!='预算计划采购流程' && record.name!='权限授权流程' && record.name!='民爆采购流程'">
<div v-if="record.name != '权限授权流程'">
<a href="javascript:void(0);" @click="openDepart(record)" >审批人员</a>
</div>
<!-- <div v-else-if="record.name!='权限授权流程'">

13
src/views/activiti/Schedule.vue
Unescape View File

@ -238,6 +238,7 @@
:isBuyerName = "lcModa.isBuyerName"
:lead = "lcModa.lead"
:rname = "lcModa.rname"
:printNumber = "lcModa.printNumber"
@afterSubmit="afterSub"
@passTask="()=>passTask(lcModa.processData)"
@backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@ -812,14 +813,13 @@ export default {
let userInfo = sessionStorage.getItem('USER_INFORMATION')
let res = JSON.parse(userInfo)
if(r.name === '主管领导'){
// console.log('-==========执行；11',r);
this.lcModa.lead = true;
}
if(r.name === '生产供应站'){
// console.log('-==========执行；11',r);
this.lcModa.rname = 1;
this.lcModa.rname = '1';
}
let param = {}
// param.id = r.procDefId
@ -850,6 +850,15 @@ export default {
if (res3.success) {
// console.log("-=-=44444444",res3.result);
if (res3.result) {
if(r.name === '生产供应站' || r.name === '物装公司'){
// console.log("生产供应站 物资调拨流程 =======")
if(!!res3.result.production){
this.lcModa.printNumber = false;
}
}else{
// console.log("生产供应站 物资调拨流程 1111111111111")
this.lcModa.printNumber = true;
}
if(r.name === '计划经营科'){
// console.log('-==========执行；11',r);
if(!!res3.result.signboard){

199
src/views/activiti/applyHome.vue
Unescape View File

@ -96,90 +96,91 @@
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆采购流程'" style="margin-bottom: 1%" v-has="'industrial:planAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆入库流程'" v-has="'industrial:warehousingAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆出库流程'" v-has="'industrial:deliberyAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆报废流程'" v-has="'industrial:srcapAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆归还流程'" v-has="'industrial:restore'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<a-card v-if="item.name=='民爆调拨流程'" v-has="'industrial:allot'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">
<div slot="title">
<a-row style="text-align: center;">
<!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
<!--<a-col span="12" style="text-align: center;">-->
<a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
<!-- <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
<!--</a-col>-->
</a-row>
</div>
<!-- <b>版本：</b>v.{{item.version}}
<br/>
<b>说明：</b>{{item.description}}-->
</a-card>
<!-- <a-card v-if="item.name=='民爆采购流程'" style="margin-bottom: 1%" v-has="'industrial:planAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">-->
<!-- <div slot="title">-->
<!-- <a-row style="text-align: center;">-->
<!-- &lt;!&ndash; <a-col span="12" :title="item.name">{{item.name}} </a-col>&ndash;&gt;-->
<!-- &lt;!&ndash;<a-col span="12" style="text-align: center;">&ndash;&gt;-->
<!-- <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>-->
<!-- &lt;!&ndash; <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>&ndash;&gt;-->
<!-- &lt;!&ndash;</a-col>&ndash;&gt;-->
<!-- </a-row>-->
<!-- </div>-->
<!-- &lt;!&ndash; <b>版本：</b>v.{{item.version}}-->
<!-- <br/>-->
<!-- <b>说明：</b>{{item.description}}&ndash;&gt;-->
<!-- </a-card>-->
<!-- <a-card v-if="item.name=='民爆入库流程'" v-has="'industrial:warehousingAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">-->
<!-- <div slot="title">-->
<!-- <a-row style="text-align: center;">-->
<!-- &lt;!&ndash; <a-col span="12" :title="item.name">{{item.name}} </a-col>&ndash;&gt;-->
<!-- &lt;!&ndash;<a-col span="12" style="text-align: center;">&ndash;&gt;-->
<!-- <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>-->
<!-- &lt;!&ndash; <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>&ndash;&gt;-->
<!-- &lt;!&ndash;</a-col>&ndash;&gt;-->
<!-- </a-row>-->
<!-- </div>-->
<!-- &lt;!&ndash; <b>版本：</b>v.{{item.version}}-->
<!-- <br/>-->
<!-- <b>说明：</b>{{item.description}}&ndash;&gt;-->
<!-- </a-card>-->
<!-- <a-card v-if="item.name=='民爆出库流程'" v-has="'industrial:deliberyAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">-->
<!-- <div slot="title">-->
<!-- <a-row style="text-align: center;">-->
<!-- &lt;!&ndash; <a-col span="12" :title="item.name">{{item.name}} </a-col>&ndash;&gt;-->
<!-- &lt;!&ndash;<a-col span="12" style="text-align: center;">&ndash;&gt;-->
<!-- <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>-->
<!-- &lt;!&ndash; <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>&ndash;&gt;-->
<!-- &lt;!&ndash;</a-col>&ndash;&gt;-->
<!-- </a-row>-->
<!-- </div>-->
<!-- &lt;!&ndash; <b>版本：</b>v.{{item.version}}-->
<!-- <br/>-->
<!-- <b>说明：</b>{{item.description}}&ndash;&gt;-->
<!-- </a-card>-->
<!-- <a-card v-if="item.name=='民爆报废流程'" v-has="'industrial:srcapAdd'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">-->
<!-- <div slot="title">-->
<!-- <a-row style="text-align: center;">-->
<!-- &lt;!&ndash; <a-col span="12" :title="item.name">{{item.name}} </a-col>&ndash;&gt;-->
<!-- &lt;!&ndash;<a-col span="12" style="text-align: center;">&ndash;&gt;-->
<!-- <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>-->
<!-- &lt;!&ndash; <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>&ndash;&gt;-->
<!-- &lt;!&ndash;</a-col>&ndash;&gt;-->
<!-- </a-row>-->
<!-- </div>-->
<!-- &lt;!&ndash; <b>版本：</b>v.{{item.version}}-->
<!-- <br/>-->
<!-- <b>说明：</b>{{item.description}}&ndash;&gt;-->
<!-- </a-card>-->
<!-- <a-card v-if="item.name=='民爆归还流程'" v-has="'industrial:restore'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">-->
<!-- <div slot="title">-->
<!-- <a-row style="text-align: center;">-->
<!-- &lt;!&ndash; <a-col span="12" :title="item.name">{{item.name}} </a-col>&ndash;&gt;-->
<!-- &lt;!&ndash;<a-col span="12" style="text-align: center;">&ndash;&gt;-->
<!-- <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>-->
<!-- &lt;!&ndash; <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>&ndash;&gt;-->
<!-- &lt;!&ndash;</a-col>&ndash;&gt;-->
<!-- </a-row>-->
<!-- </div>-->
<!-- &lt;!&ndash; <b>版本：</b>v.{{item.version}}-->
<!-- <br/>-->
<!-- <b>说明：</b>{{item.description}}&ndash;&gt;-->
<!-- </a-card>-->
<!-- <a-card v-if="item.name=='民爆调拨流程'" v-has="'industrial:allot'" hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px','width':'24%','display': 'inline-block','margin-right':'1%'}" :headStyle="{'border-radius':'12px'}">-->
<!-- <div slot="title">-->
<!-- <a-row style="text-align: center;">-->
<!-- &lt;!&ndash; <a-col span="12" :title="item.name">{{item.name}} </a-col>&ndash;&gt;-->
<!-- &lt;!&ndash;<a-col span="12" style="text-align: center;">&ndash;&gt;-->
<!-- <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>-->
<!-- &lt;!&ndash; <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>&ndash;&gt;-->
<!-- &lt;!&ndash;</a-col>&ndash;&gt;-->
<!-- </a-row>-->
<!-- </div>-->
<!-- &lt;!&ndash; <b>版本：</b>v.{{item.version}}-->
<!-- <br/>-->
<!-- <b>说明：</b>{{item.description}}&ndash;&gt;-->
<!-- </a-card>-->
<!-- -->
</template>
</a-list>
</a-collapse-panel>
@ -199,6 +200,7 @@
>
<component :disabled="lcModa.disabled" v-if="lcModa.visible" :is="lcModa.formComponent" :hieg = "lcModa.hieg"
:processData="lcModa.processData" :isNew = "lcModa.isNew" :pictureId="lcModa.pictureId" :procInstId="lcModa.procInstId"
:printNumber = "lcModa.printNumber"
@afterSubmit="afterSub" @close="closeThis">
</component>
</a-modal>
@ -372,7 +374,7 @@
}).then(res => {
if (res.success) {
// 转换null为""
console.log("res.result",res.result);
// console.log("res.result",res.result);
let arry=[];
for (let i = 0; i < res.result.length; i++) {
if (i != 0 && i != res.result.length - 1){
@ -381,7 +383,7 @@
}
_this.nodeList=arry;
if (arry.length>0){
console.log(_this.nodeList[0],"用户信息！")
// console.log(_this.nodeList[0],"用户信息！")
if (!_this.nodeList[0].users[0]){
_this.$message.warning(v.name+"审批人员未配置,请配置后在申请！！！");
ss= true;
@ -400,19 +402,19 @@
// console.log("人员信息",res);
// let bu = information();
// console.log("-=-=-=-=",bu);
if(v.name == "民爆出库流程" && res.post != "系统管理员"){
let de= {
id: res.departIds
}
let data=await getAction(this.url.queryPageDepare,de);
if(data.result.orgType != "3"){
// 小队申请
this.$message.warning("请使用小队账号提交出库申请！");
return
}
}
// if(v.name == "民爆出库流程" && res.post != "系统管理员"){
// let de= {
// id: res.departIds
// }
// let data=await getAction(this.url.queryPageDepare,de);
// if(data.result.orgType != "3"){
// // 小队申请
// this.$message.warning("请使用小队账号提交出库申请！");
// return
// }
// }
let re = false;
if(v.name != "预算计划采购流程" && v.name != "权限授权流程" && res.post != "系统管理员"){
if(v.name != "权限授权流程"){
let did = res.departIds;
let de= {
id: res.departIds
@ -441,6 +443,7 @@
this.lcModa.title = '发起流程：'+v.name;
this.lcModa.isNew = true;
this.lcModa.hieg = true;
this.lcModa.printNumber = true;
this.lcModa.pictureId=v.id;
this.lcModa.procInstId='';
this.lcModa.processData = v;

4
src/views/activiti/form/ProcessUdgetPlan.vue
Unescape View File

@ -5,7 +5,7 @@
<a-tab-pane tab="流程正文" key="1" forceRender >
<process-udget-plan-form :isNew="isNew" :processData="processData" :disabled="disabled" @afterSubmit="afterSub" @close="close" :task="task"
@passTask="passTask" @backTask="backTask" :hieg="hieg" @loadData="loadData" :isPlanType="isPlanType" :lead="lead"
:rname = "rname"
:rname = "rname" :printNumber="printNumber"
:isSourceCapital="isSourceCapital" :routePlanName="routePlanName" :itemId="itemId" :is-buyer-name="isBuyerName"/>
</a-tab-pane>
@ -58,6 +58,8 @@
isNew: {type: Boolean, default: false, required: false},
task: {type: Boolean, default: false, required: false},
isTable:{type: Boolean, default: false, required: false},
//价格
printNumber: { type: Boolean, default: true, required: false },
rname:{type: String, required: false},
/*采购类型*/
isPlanType: {type: Boolean, default: false, required: false},

28
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -446,7 +446,7 @@
title: '单价(元）',
key: 'materialPrice',
type: FormTypes.inputNumber,
disabled: this.disabled,
disabled: this.printNumber,
width: '130px',
placeholder: '请输入${title}',
defaultValue: ''
@ -613,6 +613,8 @@
task: { type: Boolean, default: false, required: false },
allotShuNumber: { type: Boolean, default: false, required: false }, ////生产供应站
isBuyerName: { type: Boolean, default: false, required: false },
printNumber: { type: Boolean, default: true, required: false }, //价格
lead: { type: Boolean, default: false, required: false },
/*采购类型*/
isPlanType: { type: Boolean, default: false, required: false },
@ -660,7 +662,7 @@
return true
}
// console.log("523452345",this.disabled);
// console.log("34523452345",this.hieg);
// console.log("34523452345",this.printNumber);
this.hiegs = this.hieg
return this.disabled
},
@ -1039,7 +1041,7 @@
this.putUnder = item.materialDepart;
}
})
console.log("===========12312 =", materialName);
// console.log("===========12312 =", materialName);
if (!!record.row.id && Object.keys(materialName).length > 0) {
this.processUdgetPlanMaterialTable.columns[0].options.push({
@ -1091,8 +1093,8 @@
}
]
this.$refs.processUdgetPlanMaterial.setValues(values)
this.isabled = true;
console.log("执行了333===",this.allotShuNumber);
// this.isabled = true;
// console.log("执行了333===",this.allotShuNumber);
}
}
@ -1534,7 +1536,7 @@
// console.log('this.planType++', this.planType)
if (!formData.tableName) formData.tableName = this.processData.businessTable
var url = this.url.addFromTableApply
let method = 'post'
let method = 'post';
if (!this.isNew) {
url = this.url.editFromTableApply
method = 'put'
@ -1559,6 +1561,10 @@
}
}
}
if(method == 'post'){
formData.materialPrice = 0;
formData.materialAmount = 0;
}
console.log(formData, '表单数据')
if (this.btndisabled === false) {
this.btndisabled = true
@ -1723,12 +1729,22 @@
this.$message.error('请填写清单内容')
return
}
let jig = false;
for (let i = 0; i < formData.processUdgetPlanMaterialList.length; i++) {
if (i == 0) {
this.describes = formData.processUdgetPlanMaterialList[i].materialName
} else {
this.describes = this.describes + '---' + formData.processUdgetPlanMaterialList[i].materialName
}
if(!this.printNumber){
if(!formData.processUdgetPlanMaterialList[i].materialPrice){
jig = true;
}
}
}
if(jig){
this.$message.error('请输入价格');
return
}
if (this.isPlanType) {
if (!formData.planType) {

12
src/views/merchandisenews/ProcessMerchandiseNewsList.vue
Unescape View File

@ -79,11 +79,11 @@
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="物资单位">-->
<!-- <a-input placeholder="请输入物资单位" v-model="queryParam.materialsUnit"></a-input>-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="品名编号">
<a-input placeholder="请输入品名编号" v-model="queryParam.materialClassify"></a-input>
</a-form-item>
</a-col>
<!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
<!-- <a-form-item label="型号">-->
<!-- <a-input placeholder="请输入型号" v-model="queryParam.type"></a-input>-->
@ -271,7 +271,7 @@
dataIndex: 'partyNumber'
},
{
title:'品名分类',
title:'品名编号',
align:"center",
dataIndex: 'descriptionId'
},

10
src/views/merchandisenews/modules/ProcessMerchandiseNewsForm.vue
Unescape View File

@ -25,6 +25,8 @@
<a-input v-decorator="['partyNumber']" placeholder="请输入第三方商品编号" ></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="品名分类" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-input v-decorator="['descriptionId']" placeholder="请输入品名编号ID" ></a-input>-->
@ -47,6 +49,8 @@
<a-input v-decorator="['materialsUnit',validatorRules.materialsUnit]" placeholder="请输入物资单位" ></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['type']" placeholder="请输入型号" ></a-input>
@ -62,6 +66,8 @@
<a-input v-decorator="['synopsis']" placeholder="请输入简介概要" ></a-input>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="归口部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-input placeholder="供应商" v-model="queryParam.materialsUnit"></a-input>-->
@ -87,6 +93,8 @@
</a-select>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="资产类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-input placeholder="供应商" v-model="queryParam.materialsUnit"></a-input>-->
@ -96,12 +104,14 @@
</a-select>
</a-form-item>
</a-col>
</a-row>
<!-- <a-col :span="8">-->
<!-- <a-form-item label="分类" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input-number v-decorator="['classify']" placeholder="请输入分类" style="width: 100%" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-row>
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
<a-button @click="submitForm">提 交</a-button>
</a-col>

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

@ -36,6 +36,8 @@
<!-- </a-select>-->
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
<!-- <a-input v-decorator="['merchandiseNewsId']" type="list" :trigger-change="true" placeholder="请输入物料" @change="getActions" />-->
@ -71,6 +73,8 @@
<a-input v-decorator="['supplierBatch']" type="list" :trigger-change="true" placeholder="请选择批次" />
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-decorator="['materialQuantity',validatorRules.materialQuantity]" placeholder="请输入数量" @change="getNum" />
@ -86,6 +90,7 @@
<a-input v-decorator="['rates']" placeholder="请输入金额（元）" disabled />
</a-form-item>
</a-col>
</a-row>
<!-- <a-col :span="8">-->
<!-- <a-form-item label="仓储地点" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
<!-- <a-input v-decorator="['unitWasteWarehouseCodeId']" type="list" :trigger-change="true" placeholder="请选择仓储地点" />-->
@ -96,6 +101,7 @@
<!-- <a-input v-decorator="['freightSpace']" type="list" :trigger-change="true" placeholder="请选择储存仓位" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
<a-row>
<a-col :span="8">
<a-form-item label="生产时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date placeholder="请选择生产时间" v-decorator="['productionTime']" :trigger-change="true" style="width: 100%" />
@ -137,6 +143,8 @@
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
<a-button @click="submitForm">提 交</a-button>
</a-col>
@ -207,7 +215,7 @@
validatorRules: {
// 'blur'是鼠标失去焦点的时候会触发验证
accountingAttributes: { rules: [{ required: true, message: '请选择物资类型!' }] },
merchandiseNewsId: { rules: [{ required: true, message: '请选择需求时间!' }] },
merchandiseNewsId: { rules: [{ required: true, message: '请选择物料!' }] },
materialQuantity: { rules: [{ required: true, message: '请输入数量!' }] },
materialPrice: { rules: [{ required: true, message: '请输入单价!' }] },
// productionTime: { rules: [{ required: true, message: '请选择生产时间!' }] },

7
src/views/system/DepartList.vue
Unescape View File

@ -37,7 +37,6 @@
:checkedKeys="checkedKeys"
:treeData="departTree"
:checkStrictly="checkStrictly"
:expandedKeys="iExpandedKeys"
:autoExpandParent="autoExpandParent"
@expand="onExpand"/>
</span>
@ -53,7 +52,7 @@
</div>
</a-card>
<!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------>
<div class="drawer-bootom-button">
<!-- <div class="drawer-bootom-button">
<a-dropdown :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@ -67,7 +66,7 @@
树操作 <a-icon type="up" />
</a-button>
</a-dropdown>
</div>
</div>-->
<!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------>
</a-col>
<a-col :md="12" :sm="24">
@ -584,7 +583,7 @@
}
}
// <!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------>
},
created() {
this.currFlowId = this.$route.params.id

Write Preview
Loading…
Cancel
Save