yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
6f4f88a36c 115a3539b1
commit
6b13c34948
6 changed files with 64 additions and 59 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. 32
      anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue
  2. 18
      anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue
  3. 18
      anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue
  4. 32
      anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue
  5. 18
      anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue
  6. 5
      anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue

32
anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordAdd.vue
View File

@ -49,26 +49,26 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">有效期至</div>
<el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">有效期至</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input class="addinputInfo" style="width: 50%" v-model="temp.remarks" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否同意</div>
<el-form-item>
<el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
<el-input class="addinputInfo" style="width: 70%" v-model="temp.remarks" clearable placeholder=""/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">是否同意</div>-->
<!-- <el-form-item>-->
<!-- <el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">-->
<!-- <el-radio label="1">是</el-radio>-->
<!-- <el-radio label="0">否</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<div class="title">基本信息</div>
<el-row>

18
anrui-base/anrui-base-ui/src/views/dealer/dealerrecord/dealerrecordInfo.vue
View File

@ -39,18 +39,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">有效期至</div>
<el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">有效期至</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ temp.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否同意</div>
<el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">是否同意</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>-->
<!-- </el-col>-->
</el-row>
<div class="title">基本信息</div>
<el-row>

18
anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangDaiBan.vue
View File

@ -42,18 +42,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">有效期至</div>
<el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">有效期至</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ temp.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否同意</div>
<el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">是否同意</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>-->
<!-- </el-col>-->
</el-row>
<div class="title">基本信息</div>
<el-row>

32
anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangEdit.vue
View File

@ -47,26 +47,26 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">有效期至</div>
<el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">有效期至</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input class="addinputInfo" style="width: 50%" v-model="temp.remarks" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否同意</div>
<el-form-item>
<el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
<el-input class="addinputInfo" style="width: 70%" v-model="temp.remarks" clearable placeholder=""/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">是否同意</div>-->
<!-- <el-form-item>-->
<!-- <el-radio-group style="font-size: 1px" class="addinputInfo" v-model="temp.agree">-->
<!-- <el-radio label="1">是</el-radio>-->
<!-- <el-radio label="0">否</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
<div class="title">基本信息</div>
<el-row>

18
anrui-base/anrui-base-ui/src/views/workFlow/jingxiaoshangFlow/jingxiaoshangYiBan.vue
View File

@ -39,18 +39,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">有效期至</div>
<el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">有效期至</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.effectiveDate }}</span></el-form-item>-->
<!-- </el-col>-->
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ temp.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否同意</div>
<el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <div class="span-sty">是否同意</div>-->
<!-- <el-form-item><span class="addinputInfo">{{ temp.agree == '1' ? '是' : temp.agree == '0' ? '否' : '' }}</span></el-form-item>-->
<!-- </el-col>-->
</el-row>
<div class="title">基本信息</div>
<el-row>

5
anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/qiyekaipiaoxinxi/kaipiaoxinxiguanli.vue
View File

@ -34,6 +34,11 @@
<span>{{ scope.row.useOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="开票类型" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.invoiceType }}</span>
</template>
</el-table-column>
<el-table-column label="开票名称" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.name }}</span>

Write Preview
Loading…
Cancel
Save