Browse Source

修改任务明细样式

wms3.0_pda
niexiting 10 months ago
parent
commit
edf27ac167
  1. 4
      api/request2.js
  2. 32
      common/style/new_style.css
  3. 6
      mycomponents/item/item.vue
  4. 2
      mycomponents/job/jobStatus.vue
  5. 2
      mycomponents/job/jobTop.vue
  6. 1
      pages/purchaseReceipt/coms/comReceiptDetailCard.vue
  7. 7
      pages/purchaseReceipt/coms/comReceiptJobCard.vue
  8. 2
      static/config.json

4
api/request2.js

@ -1,8 +1,8 @@
import request from '@/api/httpRequest2.js' import request from '@/api/httpRequest2.js'
// const baseApi = "/api/admin-api" const baseApi = "/api/admin-api"
//公司地址 //公司地址
// 本地地址 // 本地地址
const baseApi = "/admin-api" // const baseApi = "/admin-api"
/** /**
* 获取验证码 * 获取验证码
* @param {*} * @param {*}

32
common/style/new_style.css

@ -2025,6 +2025,29 @@ button::after {
} }
.card_itemCode {
font-size: 36rpx;
font-weight: 500;
padding: 10rpx;
}
.card_itemName {
color: #909399;
font-size: 30rpx;
padding: 0rpx 10rpx;
}
/* .std_pack {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
padding: 0px;
color: #909399;
font-size: 30rpx;
}
*/
.card_icon_normal { .card_icon_normal {
width: 45rpx; width: 45rpx;
height: 45rpx; height: 45rpx;
@ -2113,8 +2136,13 @@ button::after {
overflow: hidden; overflow: hidden;
} }
.task_top {
margin: 0rpx 10rpx;
background-color: #fff;
}
.task_item { .task_item {
margin: 10rpx; margin: 0rpx 10rpx;
background-color: #fff; background-color: #fff;
} }
@ -2123,7 +2151,6 @@ button::after {
background-color: #fff; background-color: #fff;
border-radius: 10rpx; border-radius: 10rpx;
margin: 12rpx; margin: 12rpx;
} }
.task_number { .task_number {
@ -2134,6 +2161,7 @@ button::after {
.task_text { .task_text {
font-size: 30rpx; font-size: 30rpx;
margin: 5rpx 0rpx;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

6
mycomponents/item/item.vue

@ -3,11 +3,11 @@
<view class="uni-flex u-col-center space-between" style=" <view class="uni-flex u-col-center space-between" style="
background-color:#fff; background-color:#fff;
margin-left: 10rpx;"> margin-left: 10rpx;">
<view class="card_partCode"> <view >
<view class="" :class="openPopup(dataContent)"> <view class="card_itemCode" :class="openPopup(dataContent)">
{{dataContent.itemCode}} {{dataContent.itemCode}}
</view> </view>
<view class=""> <view class="card_itemName">
{{dataContent.itemName}} {{dataContent.itemName}}
</view> </view>
</view> </view>

2
mycomponents/job/jobStatus.vue

@ -1,5 +1,5 @@
<template> <template>
<view style="margin: 10rpx;"> <view >
<text :class="statusStyle(jobStatus)"> <text :class="statusStyle(jobStatus)">
{{ jobStatusInfo.label}} {{ jobStatusInfo.label}}
</text> </text>

2
mycomponents/job/jobTop.vue

@ -1,5 +1,5 @@
<template> <template>
<view class="task_item"> <view class="task_top">
<view class="uni-flex space-between u-col-center"> <view class="uni-flex space-between u-col-center">
<job-number :number="dataContent.number"></job-number> <job-number :number="dataContent.number"></job-number>
<job-status :jobStatus="dataContent.status"></job-status> <job-status :jobStatus="dataContent.status"></job-status>

1
pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@ -11,7 +11,6 @@
<uni-swipe-action-item @click="swipeClick($event,item)" <uni-swipe-action-item @click="swipeClick($event,item)"
:right-options="item.scaned?scanOptions:detailOptions"> :right-options="item.scaned?scanOptions:detailOptions">
<recommend :detail="item" :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend> <recommend :detail="item" :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
</uni-swipe-action-item> </uni-swipe-action-item>
</uni-swipe-action> </uni-swipe-action>
<u-line color="#D8D8D8"></u-line> <u-line color="#D8D8D8"></u-line>

7
pages/purchaseReceipt/coms/comReceiptJobCard.vue

@ -3,17 +3,18 @@
<view class="task_item"> <view class="task_item">
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
发货单号 : {{dataContent.asnNumber}} 申请单号 : {{dataContent.requestNumber}}
</view> </view>
</view> </view>
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
要货计划单号 : {{dataContent.ppNumber}} 发货单号 : {{dataContent.asnNumber}}
</view> </view>
</view> </view>
<view class="task_text"> <view class="task_text">
<view class=""> <view class="">
供应商名称 : {{dataContent.supplierName}} 供应商代码 : {{dataContent.supplierCode}}
<!-- 供应商名称 : {{dataContent.supplierName}} -->
</view> </view>
</view> </view>
</view> </view>

2
static/config.json

@ -18,7 +18,7 @@
"request_url": { "request_url": {
"name": "request_url", "name": "request_url",
"value": "http://localhost:12080", "value": "http://dev.ccwin-in.com:25100",
"dev":"http://dev.ccwin-in.com:25100/api", "dev":"http://dev.ccwin-in.com:25100/api",
"local":"http://localhost:12080", "local":"http://localhost:12080",
"desc": "api请求地址" "desc": "api请求地址"

Loading…
Cancel
Save