zhangsiyu
/
erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ddd

master
huangli865118801 4 years ago
parent
0d7708e538
commit
3e0c921045
9 changed files with 28 additions and 24 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. 4
      pages/assembleInfo/assembleInfo.vue
  2. 10
      pages/assembleInfo/index.scss
  3. 4
      pages/hardwareInfo/hardwareInfo.vue
  4. 8
      pages/hardwareInfo/index.scss
  5. 2
      pages/rawMaterialInfo/index.scss
  6. 8
      pages/sprayInfo/index.scss
  7. 4
      pages/sprayInfo/sprayInfo.vue
  8. 8
      pages/stampingInspectionInfo/index.scss
  9. 4
      pages/stampingInspectionInfo/stampingInspectionInfo.vue

4
pages/assembleInfo/assembleInfo.vue
Unescape View File

@ -63,7 +63,7 @@
<view v-for="(item, index) in configSet" :key="index">
<view class="big-title">{{ item.title }}</view>
<view v-for="(value, idx) in item.check_conf_msg" :key="idx" class="cyxj-content">
<view class="cyxj-content-card" v-if="item.set == 1">
<view class="cyxj-content-card" v-if="item.check_conf_msg[idx].status == 1">
<view class="xx-card">
<view class="xx-title">{{ value.title }}</view>
<view class="xx-ul">
@ -197,7 +197,7 @@ export default {
for (let b in this.configSet) {
for (let i in this.configSet[b].check_conf_msg) {
let items = this.configSet[b].check_conf_msg[i];
if (this.configSet[b].set == 1) {
if (this.configSet[b].status == 1) {
if (items.choice == 'NG' && (!items.content || !items.situation)) {
this.$functions.error('请完整填写信息');
return false;

10
pages/assembleInfo/index.scss
Unescape View File

@ -71,6 +71,7 @@
border: 1upx solid #F1F1F1;
border-radius: 4upx;
margin-left: 24upx;
border-radius: 2upx;
input{
font-size: 26upx;
margin-left: 20upx;
@ -148,6 +149,7 @@
@include flex(center,center);
border: 1upx solid #F1F1F1;
margin-top: 24upx;
border-radius: 2upx;
input{
font-size: 24upx;
}
@ -172,14 +174,14 @@
.cyxj-content{
@include wh(750upx,auto);
padding-top: 30upx;
padding-bottom: 30upx;
padding-top: 20upx;
padding-bottom: 20upx;
background: white;
.cyxj-content-card{
@include wh(710upx,auto);
margin: auto;
padding-top: 30upx;
padding-bottom: 30upx;
// padding-top: 30upx;
// padding-bottom: 30upx;
.title{
width: 710upx;
margin: auto;

4
pages/hardwareInfo/hardwareInfo.vue
Unescape View File

@ -79,7 +79,7 @@
<view v-for="(item, index) in configSet" :key="index">
<view class="big-title">{{ item.title }}</view>
<view v-for="(value, idx) in item.check_conf_msg" :key="idx" class="cyxj-content" >
<view class="cyxj-content-card" v-if="item.set == 1">
<view class="cyxj-content-card" v-if="item.check_conf_msg[idx].status == 1">
<view class="xx-card">
<view class="xx-title">{{ value.title }}</view>
<view class="xx-ul">
@ -221,7 +221,7 @@ export default {
for (let b in this.configSet) {
for (let i in this.configSet[b].check_conf_msg) {
let items = this.configSet[b].check_conf_msg[i];
if (this.configSet[b].set == 1) {
if (this.configSet[b].status == 1) {
if (items.choice == 'NG' && (!items.content || !items.situation)) {
this.$functions.error('请完整填写信息');
return false;

8
pages/hardwareInfo/index.scss
Unescape View File

@ -172,14 +172,14 @@
.cyxj-content{
@include wh(750upx,auto);
padding-top: 30upx;
padding-bottom: 30upx;
padding-top: 20upx;
padding-bottom: 20upx;
background: white;
.cyxj-content-card{
@include wh(710upx,auto);
margin: auto;
padding-top: 30upx;
padding-bottom: 30upx;
// padding-top: 30upx;
// padding-bottom: 30upx;
.title{
width: 710upx;
margin: auto;

2
pages/rawMaterialInfo/index.scss
Unescape View File

@ -22,6 +22,7 @@
font-size: 24upx;
border: 1upx solid #F1F1F1;
padding: 10upx;
border-radius: 2upx;
}
view{
@include fonts(26upx,#333,500);
@ -66,6 +67,7 @@
font-size: 24upx;
border: 1upx solid #F1F1F1;
padding: 10upx;
border-radius: 2upx;
}
text{
@include fonts(28upx,#999,400);

8
pages/sprayInfo/index.scss
Unescape View File

@ -172,14 +172,14 @@
.cyxj-content{
@include wh(750upx,auto);
padding-top: 30upx;
padding-bottom: 30upx;
padding-top: 20upx;
padding-bottom: 20upx;
background: white;
.cyxj-content-card{
@include wh(710upx,auto);
margin: auto;
padding-top: 30upx;
padding-bottom: 30upx;
// padding-top: 30upx;
// padding-bottom: 30upx;
.title{
width: 710upx;
margin: auto;

4
pages/sprayInfo/sprayInfo.vue
Unescape View File

@ -69,7 +69,7 @@
<view v-for="(item, index) in configSet" :key="index">
<view class="big-title">{{ item.title }}</view>
<view v-for="(value, idx) in item.check_conf_msg" :key="idx" class="cyxj-content">
<view class="cyxj-content-card" v-if="item.set == 1">
<view class="cyxj-content-card" v-if="item.check_conf_msg[idx].status == 1">
<view class="xx-card">
<view class="xx-title">{{ value.title }}</view>
<view class="xx-ul">
@ -202,7 +202,7 @@ export default {
for (let b in this.configSet) {
for (let i in this.configSet[b].check_conf_msg) {
let items = this.configSet[b].check_conf_msg[i];
if (this.configSet[b].set == 1) {
if (this.configSet[b].status == 1) {
if (items.choice == 'NG' && (!items.content || !items.situation)) {
this.$functions.error('请完整填写信息');
return false;

8
pages/stampingInspectionInfo/index.scss
Unescape View File

@ -160,14 +160,14 @@
.cyxj-content{
@include wh(750upx,auto);
padding-top: 30upx;
padding-bottom: 30upx;
padding-top:20upx;
padding-bottom: 20upx;
background: white;
.cyxj-content-card{
@include wh(710upx,auto);
margin: auto;
padding-top: 30upx;
padding-bottom: 30upx;
//padding-top: 30upx;
//padding-bottom: 30upx;
.title{
width: 710upx;
margin: auto;

4
pages/stampingInspectionInfo/stampingInspectionInfo.vue
Unescape View File

@ -48,7 +48,7 @@
<view v-for="(item, index) in configSet" :key="index">
<view class="big-title">{{ item.title }}</view>
<view v-for="(value, idx) in item.check_conf_msg" :key="idx" class="cyxj-content" >
<view class="cyxj-content-card" v-if="item.set == 1">
<view class="cyxj-content-card" v-if="item.check_conf_msg[idx].status == 1">
<view class="xx-card">
<view class="xx-title">{{ value.title }}</view>
<view class="xx-ul">
@ -175,7 +175,7 @@ export default {
for (let b in this.configSet) {
for (let i in this.configSet[b].check_conf_msg) {
let items = this.configSet[b].check_conf_msg[i];
if (this.configSet[b].set == 1) {
if (this.configSet[b].status == 1) {
if (items.choice == 'NG' && (!items.content || !items.situation)) {
this.$functions.error('请完整填写信息');
return false;

Write Preview
Loading…
Cancel
Save