整理样式2024/8/1 01:18:59

src/common/style/pdabasic.css

@@ -731,6 +731,15 @@ page {
 	font-size: 35rpx;
 	padding: 10rpx 20rpx 20rpx;
 }
+.page-header .header-view {
+	display: flex;
+	flex-direction: column;
+	background-color: #fff;
+	font-size: 35rpx;
+	padding: 10rpx 20rpx;
+	border-radius:4px;
+}
+
 .page-header-box{
 	background-color: #fff !important;
 	padding:0px 20rpx 20rpx;

src/mycomponents/scan/winComScanBalanceLocation.vue

@@ -200,9 +200,9 @@ export default {
         .then((res) => {
           if (res.data != null && res.data.list.length > 0) {
             const result = res.data.list[0]
-            const { status } = result
+            const status = result.available
             const { type } = result
-            if (status == 'ENABLE') {
+            if (status == 'TRUE') {
               if (checkDirectoryItemExist(this.itemTypesList, type)) {
                 callBack()
               } else {

src/mycomponents/scan/winScanItem.vue

@@ -85,14 +85,14 @@ const getScanResult = (resultParams) => {
       uni.hideLoading()
       if (res.data != null && res.data.list.length > 0) {
         const result1 = res.data.list[0]
-        const { status } = result1
+				const status =result1.available
         const { type } = result1
         const itemCode = result1.code
         const itemName = result1.name
         const { uom } = result1
         const std = result1.uom
         result1.package = scanResult.package
-        if (status == 'ENABLE') {
+        if (status == 'TRUE') {
           if (checkDirectoryItemExist(props.itemCodeTypeList, type)) {
             result.value = result1
             callBack()

src/pages/count/job/countBlindDetail.vue

@@ -1,26 +1,28 @@
 <template>
   <view class="page-wraper">
-    <view class="header">
-      <view class="">
-        <job-top :dataContent="jobContent"></job-top>
-      </view>
-      <view class="cen_card" style="padding-top: 10rpx; padding-bottom: 10rpx">
-        <view class="cell_box uni-flex uni-row" style="font-weight: bold">
-          <view class="cell_info" style="color: #000">
-            <view class="text_lightblue" style="color: #000">阶段</view>
-            <view style="color: #000">{{ getCountStageName(jobContent.stage) }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">策略</view>
-            <view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">库位</view>
-            <view style="color: #000">{{ fromLocationCode }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">已扫描</view>
-            <view style="color: #000">{{ scanCount }}</view>
+    <view class="page-header">
+      <view class="header-view">
+        <view class="header_job_top">
+          <job-top :dataContent="jobContent"></job-top>
+        </view>
+        <view class="cen_card" style="padding-top: 10rpx; padding-bottom: 10rpx">
+          <view class="cell_box uni-flex uni-row" style="font-weight: bold">
+            <view class="cell_info" style="color: #000">
+              <view class="text_lightblue" style="color: #000">阶段</view>
+              <view style="color: #000">{{ getCountStageName(jobContent.stage) }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">策略</view>
+              <view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">库位</view>
+              <view style="color: #000">{{ fromLocationCode }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">已扫描</view>
+              <view style="color: #000">{{ scanCount }}</view>
+            </view>
           </view>
         </view>
       </view>

src/pages/count/job/countDetail.vue

@@ -43,7 +43,7 @@
 
     <win-scan-button @goScan="openScanPopup"></win-scan-button>
     <win-scan-pack-and-location ref="scanPopup" :noShowBalanceMessage="true" :isCount="true" @getCountScanResult="getScanResult"> </win-scan-pack-and-location>
-    <count-qty-edit ref="countQtyEditRef" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit>
+    <count-qty-edit ref="countQtyEdit" @confirm="editConfirm" @close="editClose" :isShowStatus="true" :allowEditStatus="editInventoryStatus" :isShowBalance="jobContent.isOpenCount == 'TRUE'"> </count-qty-edit>
     <balance-select ref="balanceSelectRef" @onSelectItem="selectBalanceItem"></balance-select>
     <com-message ref="comMessageRef" />
   </view>

src/pages/count/job/fuzzyCountDetail.vue

@@ -2,20 +2,22 @@
   <view class="page-wraper">
     <view class="page-header">
       <view class="header_job_top">
-        <job-top :dataContent="jobContent"></job-top>
-        <uni-collapse ref="collapse">
-          <uni-collapse-item :open="true">
-            <template v-slot:title>
-              <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx"> 盘点范围 </view>
-            </template>
-            <view v-for="(range, index) in jobContent.countRange" :key="index">
-              <view class="card_view">
-                <text class="card_packing_code">{{ getCountScopeName(range.type) }}</text>
-                <text class="card_content">{{ range.value }}</text>
+        <view class="header-view">
+          <job-top :dataContent="jobContent"></job-top>
+          <uni-collapse ref="collapse">
+            <uni-collapse-item :open="true">
+              <template v-slot:title>
+                <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx"> 盘点范围 </view>
+              </template>
+              <view v-for="(range, index) in jobContent.countRange" :key="index">
+                <view class="card_view">
+                  <text class="card_packing_code">{{ getCountScopeName(range.type) }}</text>
+                  <text class="card_content">{{ range.value }}</text>
+                </view>
               </view>
-            </view>
-          </uni-collapse-item>
-        </uni-collapse>
+            </uni-collapse-item>
+          </uni-collapse>
+        </view>
       </view>
       <view class="card_view" v-if="fromLocationCode != ''">
         <text class="card_location">盘点库位</text>

src/pages/customerReturn/job/returnDetail.vue

@@ -1,5 +1,15 @@
 <template>
   <view class="page-wraper">
+    <view class="page-header">
+      <view class="header-view">
+        <view class="header_job_top">
+          <job-top :dataContent="jobContent"></job-top>
+        </view>
+        <view class="header_item">
+          <view>客户代码:{{ jobContent.customerCode }}</view>
+        </view>
+      </view>
+    </view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
         <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -45,6 +55,7 @@ import winScanPackAndLocation from '@/mycomponents/scan/winScanPackAndLocation.v
 import locationCompare from '@/mycomponents/location/locationCompare.vue'
 import comDetailCard from '@/mycomponents/detail/comDetailCard.vue'
 import detailInfoPopup from '@/pages/customerReturn/coms/detailInfoPopup.vue'
+import jobTop from '@/mycomponents/job/jobTop.vue'
 import { useCountStore } from '@/store'
 // 获取自定义的store
 const store = useCountStore()

src/pages/inspect/request/inspectRequestDetail.vue

@@ -1,14 +1,16 @@
 <template>
   <view class="page-wraper">
+    <view class="page-header">
+      <view class="header-view">
+        <view class="header_item"> 单据号 : {{ requestContent.number }} </view>
+        <view class="header_item">
+          <text>供应商代码 : {{ requestContent.supplierCode }} </text>
+        </view>
+      </view>
+    </view>
+    <view class="split_line"></view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
-        <view class="" style="background-color: #fff; padding-left: 20rpx; padding-right: 20rpx; padding-top: 20rpx; padding-bottom: 20rpx">
-          <view class="" style="font-size: 35rpx"> 单据号 : {{ requestContent.number }} </view>
-          <view class="" style="font-size: 35rpx">
-            <text>供应商代码 : {{ requestContent.supplierCode }} </text>
-          </view>
-        </view>
-        <view class="split_line"></view>
         <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
           <view class="">
             <comRequestDetailCard :dataContent="item" :isShowBatch="false" @openDetail="openDetail"> </comRequestDetailCard>

src/pages/inventoryMove/job/inventoryMoveDetail.vue

@@ -5,8 +5,6 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
-        <!-- <view class="split_line"></view> -->
       </view>
     </view>
 

src/pages/issue/coms/comIssueRequestPopup.vue

@@ -84,7 +84,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { getBasicItemByCode, getProductionlineItem, getWorkShopLineStation, getWarehouseCodeList } from '@/api/request2.js'
+import { getProductionlineItem, getWorkShopLineStation, getWarehouseCodeList } from '@/api/request2.js'
 import { getLocationTypeName, getListLocationTypeDesc, checkDirectoryItemExist } from '@/common/directory.js'
 import uomCom from '@/mycomponents/qty/uom.vue'
 import packQty from '@/mycomponents/qty/packQty.vue'

src/pages/package/job/overPackageJobDetail.vue

@@ -1,46 +1,57 @@
 <template>
   <view class="page-wraper">
-    <div style="background: white">
-      <print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
-    </div>
     <view class="page-header">
-      <view class="page-header-box">
+      <view class="header-view">
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
+        <view class="cen_card" style="padding: 5rpx" v-if="subList.length > 0">
+          <view class="cell_box uni-flex uni-row">
+            <view class="cell_info">
+              <view class="text_lightblue">翻包前包装规格</view>
+              <view> {{ getPackUnitName(subList[0].fromPackUnit) }}/{{ subList[0].fromPackQty }}({{ getUomInfo(subList[0].uom) }}) </view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue">翻包后包装规格</view>
+              <view> {{ getPackUnitName(subList[0].toPackUnit) }}/{{ subList[0].toPackQty }}({{ getUomInfo(subList[0].uom) }}) </view>
+            </view>
+          </view>
+        </view>
       </view>
-      <!-- <view class="header_item">
-				申请单号 : {{jobContent.requestNumber}}
-			</view> -->
     </view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
         <view v-for="(toLocation, index) in detailSource" :key="index">
-          <view class="cen_card" style="margin: 20rpx; width: auto" v-if="subList.length > 0">
-            <view class="cell_box uni-flex uni-row">
-              <view class="cell_info">
-                <view class="text_lightblue">翻包前包装规格</view>
-                <view style="font-size: 26rpx">
-                  <text style="font-weight: bold; font-size: 30rpx">{{ subList[0].fromPackQty }} ({{ handleGetUomInfo(subList[0].uom) }})/{{ handleGetPackUnitName(subList[0].fromPackUnit) }}</text>
-                </view>
-              </view>
-              <view class="cell_info">
-                <view class="text_lightblue">翻包后包装规格</view>
-                <view style="font-size: 26rpx">
-                  <text style="font-weight: bold; font-size: 30rpx">{{ subList[0].toPackQty }}({{ handleGetUomInfo(subList[0].uom) }})/{{ handleGetPackUnitName(subList[0].toPackUnit) }}</text>
-                </view>
-              </view>
-            </view>
-          </view>
-
-          <comOverPackJobDetailCard ref="comOverPackJobDetailCardRef" :dataContent="toLocation" @updateData="updateData"> </comOverPackJobDetailCard>
+          <comOverPackJobDetailCard ref="comOverPackJobDetailCard" :dataContent="toLocation" @updateData="updateData"> </comOverPackJobDetailCard>
         </view>
       </scroll-view>
     </view>
-
+    <view style="background: white">
+      <uni-collapse>
+        <uni-collapse-item>
+          <template v-slot:title>
+            <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx"> 打印设置 </view>
+          </template>
+          <print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
+        </uni-collapse-item>
+      </uni-collapse>
+    </view>
+    <view style="background: white">
+      <uni-collapse>
+        <uni-collapse-item>
+          <template v-slot:title>
+            <view class="card_itemName" style="padding: 3px 5px; font-size: 28rpx"> 打印设置 </view>
+          </template>
+          <print ref="printService" @printCode="printCode" @templateCode="templateCode"></print>
+        </uni-collapse-item>
+      </uni-collapse>
+    </view>
     <view class="page-footer">
-      <view class="uni-flex u-col-center space-between padding_20" style="background-color: ghostwhite; width: 100%">
-        <button class="btn_single_commit" style="flex: 1" hover-class="btn_commit_after" @click="submit()">提交</button>
+      <view class="uni-flex u-col-center space-between padding_10" style="background-color: ghostwhite; width: 100%">
+        <view class=""> </view>
+        <view class="uni-flex uni-row">
+          <button class="btn_single_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
+        </view>
       </view>
     </view>
 

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -5,7 +5,7 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
+        <!-- <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view> -->
       </view>
     </view>
     <view class="page-main">

src/pages/productReceipt/job/ccProductReceiptDetail.vue

@@ -5,40 +5,35 @@
 				<job-top :dataContent="jobContent"></job-top>
 			</view>
 		</view>
-
+		<view class="cell_box uni-flex uni-row">
+			<view class="cell_info">
+				<view class="text_lightblue">车间</view>
+				<view>
+					{{ jobContent.workShopCode }}
+				</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">生产线</view>
+				<view>
+					{{jobContent.subList[0].productionLineCode}}
+				</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">班组</view>
+				<view>
+					{{ jobContent.team }}
+				</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">班次</view>
+				<view>
+					{{ jobContent.shift }}
+				</view>
+			</view>
+		</view>
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="cen_card" style="padding: 5rpx">
-						<view class="cell_box uni-flex uni-row">
-							<view class="cell_info">
-								<view class="text_lightblue">车间</view>
-								<view>
-									{{ jobContent.workShopCode }}
-								</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">生产线</view>
-								<view>
-									{{ item.subList[0].productionLineCode }}
-								</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">班组</view>
-								<view>
-									{{ jobContent.team }}
-								</view>
-							</view>
-							<view class="cell_info">
-								<view class="text_lightblue">班次</view>
-								<view>
-									{{ jobContent.shift }}
-								</view>
-							</view>
-						</view>
-						<view class="split_line"></view>
-					</view>
-
 					<view class="">
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData" :locationAreaTypeList="toLocationAreaTypeList">

src/pages/productReceipt/job/productReceiptDetail.vue

@@ -8,39 +8,37 @@
       </view>
     </view>
 
+    <view class="cen_card" style="padding: 20rpx 0px 0px">
+      <view class="cell_box uni-flex uni-row">
+        <view class="cell_info">
+          <view class="text_lightblue">车间</view>
+          <view>
+            {{ jobContent.workShopCode }}
+          </view>
+        </view>
+        <view class="cell_info">
+          <view class="text_lightblue">生产线</view>
+          <view>
+            {{ jobContent.subList[0].productionLineCode }}
+          </view>
+        </view>
+        <view class="cell_info">
+          <view class="text_lightblue">班组</view>
+          <view>
+            {{ jobContent.team }}
+          </view>
+        </view>
+        <view class="cell_info">
+          <view class="text_lightblue">班次</view>
+          <view>
+            {{ jobContent.shift }}
+          </view>
+        </view>
+      </view>
+    </view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
-        <view class="detail-list u-p-t-20" v-for="(item, index) in detailSource" :key="item.id">
-          <view class="cen_card" style="padding: 20rpx 0px 0px">
-            <view class="cell_box uni-flex uni-row">
-              <view class="cell_info">
-                <view class="text_lightblue">车间</view>
-                <view>
-                  {{ jobContent.workShopCode }}
-                </view>
-              </view>
-              <view class="cell_info">
-                <view class="text_lightblue">生产线</view>
-                <view>
-                  {{ item.subList[0].productionLineCode }}
-                </view>
-              </view>
-              <view class="cell_info">
-                <view class="text_lightblue">班组</view>
-                <view>
-                  {{ jobContent.team }}
-                </view>
-              </view>
-              <view class="cell_info">
-                <view class="text_lightblue">班次</view>
-                <view>
-                  {{ jobContent.shift }}
-                </view>
-              </view>
-            </view>
-            <view class="split_line"></view>
-          </view>
-
+        <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
           <view class="">
             <comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false" @remove="updateData" @updateData="updateData" :locationAreaTypeList="toLocationAreaTypeList"> </comProductDetailCard>
           </view>

src/pages/productReceipt/job/scrapReceiptDetail.vue

@@ -5,7 +5,7 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
+        <!-- <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view> -->
       </view>
     </view>
 

src/pages/productRecycle/job/productRecycleJobDetail.vue

@@ -5,7 +5,7 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号：{{ jobContent.requestNumber }} </view>
+        <!-- <view class="header_item"> 申请单号：{{ jobContent.requestNumber }} </view> -->
         <!-- <view class="split_line"></view> -->
       </view>
     </view>

src/pages/productionReceipt/coms/comProductionJobCard.vue

@@ -1,9 +1,13 @@
 <template>
   <job-com-main-card :dataContent="dataContent">
     <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
-    <view class="">
-      <text style="font-size: 32rpx; margin-left: 35rpx">生产线</text>
-      <text style="font-size: 35rpx; margin-left: 10rpx; font-weight: bold">{{ dataContent.productionLineCode }}</text>
+    <view class="task_item" style="margin-left: 15px">
+      <view class="task_text">
+        <view class="card_view">
+          <text class="card_packing_code">生产线</text>
+          <text class="card_content">{{ dataContent.productionLineCode }}</text>
+        </view>
+      </view>
     </view>
   </job-com-main-card>
 </template>

src/pages/stockUp/job/stockUpJobDetail.vue

@@ -5,7 +5,7 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号：{{ jobContent.requestNumber }} </view>
+        <!-- <view class="header_item"> 申请单号：{{ jobContent.requestNumber }} </view> -->
         <!-- <view class="split_line"></view> -->
       </view>
     </view>
@@ -47,7 +47,7 @@ import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 import { getStockUpJobDetail, takeStockUpJob, cancleTakeStockUpJob, stockUpJobsubmit } from '@/api/request2.js'
 
-import { calc } from '@/common/calc.js'
+import { calc } from '@/common/calc.js's
 
 import { goHome, navigateBack, getRemoveOption, getCurrDateTime, getDirectoryItemArray, getPackingNumberAndBatch } from '@/common/basic.js'
 

src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue

@@ -1,13 +1,13 @@
 <template>
   <view class="page-wraper">
+    <view class="page-header">
+      <view class="header-view">
+        <view class="header_item"> 发货单号:{{ dataContent.asnNumber }} </view>
+        <view class="header_item"> 供应商代码:{{ dataContent.supplierCode }} </view>
+      </view>
+    </view>
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
-        <view class="" style="padding: 10rpx 30rpx; font-size: 32rpx">
-          <!-- padding-left: 20rpx;padding-right: 20rpx; padding-top: 10rpx;padding-bottom: 10rpx -->
-          <view style="padding: 5rpx"> 发货单号:{{ dataContent.asnNumber }} </view>
-          <view style="padding: 5rpx"> 供应商代码:{{ dataContent.supplierCode }} </view>
-        </view>
-        <u-line />
         <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
           <view class="">
             <com-record-detail-card :dataContent="item" :index="index" @remove="updateData" @updateData="updateData" @openDetail="openDetail"> </com-record-detail-card>

src/pages/transfer/job/issueDetail.vue

@@ -5,7 +5,6 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
       </view>
     </view>
     <view class="page-main">

src/pages/unPlanned/job/issueJobDetail.vue

@@ -5,7 +5,7 @@
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
-        <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
+        <!-- <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view> -->
         <!-- <view class='split_line'></view> -->
       </view>
     </view>