From ad6ea924733b96ec66d48ad830d7f116225e8ffe Mon Sep 17 00:00:00 2001
From: sunshine <1467939124@qq.com>
Date: Wed, 24 Jul 2024 11:07:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=9B=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD=EF=BC=8C=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88bug=EF=BC=8C=E8=AF=B7?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8u-button,el-button=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index.vue                | 369 +++++++++++++++++++----------
 src/static/images/icon/product.png | Bin 0 -> 691 bytes
 2 files changed, 239 insertions(+), 130 deletions(-)
 create mode 100644 src/static/images/icon/product.png

diff --git a/src/pages/index.vue b/src/pages/index.vue
index 7540ea8..42d7e41 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -26,132 +26,195 @@
       </u-tabs>
     </u-sticky>
     <uni-notice-bar show-icon scrollable text="安全生产！有序生产！高效生产！" />
-    <el-collapse accordion  v-if="current === 0">
-      <el-collapse-item v-for="(item, index) in startList"  :name="item.id" :key="index">
-        <template #title>
-          <el-icon><Tickets /></el-icon>
-          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
-          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-        </template>
-        <el-row>
-          <el-col :span="8">
-            <el-text type="success">{{item.code}}</el-text>-
-          </el-col>
-          <el-col :span="12">
-            <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="success" plain  @click="updatePlan(item.id, item.code,'end')">完工</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text>
-          </el-col>
-          <el-col :span="8">
-            <el-text type="warning">入库数:{{ item.finishNumber }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="warning" plain  @click="updatePlan(item.id,item.code,'pause')">暂停</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-text>备注:{{ item.remark }}</el-text>
-          </el-col>
-          <el-col :span="4">
-            <el-button type="info" plain  @click="planProgress(item)">进度</el-button>
-          </el-col>
-        </el-row>
-      </el-collapse-item>
-    </el-collapse>
+    <!--    开工中-->
+    <view v-if="current === 0" class="container" >
+      <u-list>
+        <u-list-item
+            v-for="item in startList"
+            :key="item"
+        >
+          <view class="content">
+            <view class="header">
+              <view class="title">
+                <u-image
+                    src="@/static/images/icon/product.png"
+                    width="40rpx"
+                    height="40rpx"
+                />
+                <text class="name">
+                  {{ item.productName }}
+                </text>
+              </view>
+              <el-text type="success">{{item.code}}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划数:{{ item.planNumber }}</el-text>
+              <el-text>入库数:{{ item.finishNumber }}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
+              <el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
+            </view>
+            <view class="text">
+              <el-text>备注:</el-text>
+            </view>
+            <view class="remark">
+              <el-text>{{ item.remark }}</el-text>
+            </view>
+            <view class="u-m-t-30 u-m-b-30"><u-line/></view>
+            <view class="u-flex justify-end">
+              <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
+                <u-button type="success" plain  @click="updatePlan(item.id, item.code,'end')">完工</u-button>
+              </el-col>
+              <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
+                <u-button type="warning" plain  @click="updatePlan(item.id,item.code,'pause')">暂停</u-button>
+              </el-col>
+              <el-col :span="4">
+                <u-button type="info" plain  @click="planProgress(item)">进度</u-button>
+              </el-col>
+            </view>
+          </view>
+        </u-list-item>
+      </u-list>
+    </view>
     <!--    派工中-->
-    <el-collapse accordion  v-if="current === 1">
-      <el-collapse-item v-for="(item, index) in paigongList"  :name="item.id" :key="index">
-        <template #title>
-          <el-icon><Tickets /></el-icon>
-          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
-          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-        </template>
-        <el-row>
-          <el-col :span="8">
-            <el-text type="success">{{item.code}}</el-text>-
-          </el-col>
-          <el-col :span="12">
-            <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="info" plain  @click="updatePlan(item.id,item.code, 'start')">开工</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text>
-          </el-col>
-        </el-row>
-        <el-text>备注:{{ item.remark }}</el-text>
-      </el-collapse-item>
-    </el-collapse>
+    <view v-if="current === 1" class="container" >
+      <u-list>
+        <u-list-item
+            v-for="item in dispatch"
+            :key="item"
+        >
+          <view class="content">
+            <view class="header">
+              <view class="title">
+                <u-image
+                    src="@/static/images/icon/product.png"
+                    width="40rpx"
+                    height="40rpx"
+                />
+                <text class="name">
+                  {{ item.productName }}
+                </text>
+              </view>
+              <el-text type="success">{{item.code}}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划数:{{ item.planNumber }}</el-text>
+              <el-text>入库数:{{ item.finishNumber }}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
+              <el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
+            </view>
+            <view class="text">
+              <el-text>备注:</el-text>
+            </view>
+            <view class="remark">
+              <el-text>{{ item.remark }}</el-text>
+            </view>
+            <view class="u-m-t-30 u-m-b-30"><u-line/></view>
+            <view class="u-flex justify-end">
+              <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
+                <u-button type="info" plain  @click="updatePlan(item.id,item.code, 'start')">开工</u-button>
+              </el-col>
+            </view>
+          </view>
+        </u-list-item>
+      </u-list>
+    </view>
     <!--    计划中-->
-    <el-collapse accordion v-if="current === 2">
-      <el-collapse-item v-for="(item, index) in planList"  :name="item.id" :key="index">
-        <template #title>
-          <el-icon><Tickets /></el-icon>
-          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
-          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-        </template>
-        <el-row>
-          <el-col :span="8">
-            <el-text type="success">{{item.code}}</el-text>-
-          </el-col>
-          <el-col :span="12">
-            <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="primary" plain>派工</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text>
-          </el-col>
-        </el-row>
-        <el-text>备注:{{ item.remark }}</el-text>
-      </el-collapse-item>
-    </el-collapse>
+    <view v-if="current === 2" class="container" >
+      <u-list>
+        <u-list-item
+            v-for="item in planList"
+            :key="item"
+        >
+          <view class="content">
+            <view class="header">
+              <view class="title">
+                <u-image
+                    src="@/static/images/icon/product.png"
+                    width="40rpx"
+                    height="40rpx"
+                />
+                <text class="name">
+                  {{ item.productName }}
+                </text>
+              </view>
+              <el-text type="success">{{item.code}}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划数:{{ item.planNumber }}</el-text>
+              <el-text>入库数:{{ item.finishNumber }}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
+              <el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
+            </view>
+            <view class="text">
+              <el-text>备注:</el-text>
+            </view>
+            <view class="remark">
+              <el-text>{{ item.remark }}</el-text>
+            </view>
+            <view class="u-m-t-30 u-m-b-30"><u-line/></view>
+            <view class="u-flex justify-end">
+              <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
+                <u-button type="primary" plain>派工</u-button>
+              </el-col>
+            </view>
+          </view>
+        </u-list-item>
+      </u-list>
+    </view>
     <!--   暂停中 -->
-    <el-collapse accordion v-if="current === 3">
-      <el-collapse-item v-for="(item, index) in pauseList"  :name="item.id" :key="index">
-        <template #title>
-          <el-icon><Tickets /></el-icon>
-          <el-text  size="large">{{item.productName}}</el-text>&nbsp;/&nbsp;
-          <el-text type="success">计划数:{{ item.planNumber }}</el-text>
-        </template>
-        <el-row>
-          <el-col :span="8">
-            <el-text type="success">{{item.code}}</el-text>-
-          </el-col>
-          <el-col :span="12">
-            <el-text  type="success">计划开始:{{ timestampToTime(item.planStartTime) }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="success" plain  @click="updatePlan(item.id,item.code, 'end')">完工</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-text type="warning">计划结束:{{ timestampToTime(item.planEndTime) }}</el-text>
-          </el-col>
-          <el-col :span="8">
-            <el-text type="warning">入库数:{{ item.finishNumber }}</el-text>
-          </el-col>
-          <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
-            <el-button type="info" plain @click="updatePlan(item.id, item.code,'start')">开工</el-button>
-          </el-col>
-        </el-row>
-        <el-text>备注:{{ item.remark }}</el-text>
-      </el-collapse-item>
-    </el-collapse>
+    <view v-if="current === 3" class="container" >
+      <u-list>
+        <u-list-item
+            v-for="item in pauseList"
+            :key="item"
+        >
+          <view class="content">
+            <view class="header">
+              <view class="title">
+                <u-image
+                    src="@/static/images/icon/product.png"
+                    width="40rpx"
+                    height="40rpx"
+                />
+                <text class="name">
+                  {{ item.productName }}
+                </text>
+              </view>
+              <el-text type="success">{{item.code}}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划数:{{ item.planNumber }}</el-text>
+              <el-text>入库数:{{ item.finishNumber }}</el-text>
+            </view>
+            <view class="flex-box">
+              <el-text>计划开始时间:{{ timestampToTime(item.planStartTime) }}</el-text>
+              <el-text>计划结束时间:{{ timestampToTime(item.planEndTime) }}</el-text>
+            </view>
+            <view class="text">
+              <el-text>备注:</el-text>
+            </view>
+            <view class="remark">
+              <el-text>{{ item.remark }}</el-text>
+            </view>
+            <view class="u-m-t-30 u-m-b-30"><u-line/></view>
+            <view class="u-flex justify-end">
+              <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4" class="u-m-r-30">
+                <u-button type="info" plain @click="updatePlan(item.id, item.code,'start')">开工</u-button>
+              </el-col>
+              <el-col v-if="auth.hasPermi('mes:plan:update')" :span="4">
+                <u-button type="success" plain  @click="updatePlan(item.id,item.code, 'end')">完工</u-button>
+              </el-col>
+            </view>
+          </view>
+        </u-list-item>
+      </u-list>
+    </view>
     <!--    <view class="charts-box">-->
     <!--      <qiun-data-charts :chartData="chartData" type="column"/>-->
     <!--    </view>-->
@@ -160,17 +223,15 @@
 
 <script setup>
 import { ref, onMounted } from 'vue';
-import useUserStore from '@/store/modules/user'
 import { updateStatus, getByStatus } from "@/api/mes/plan"
 import { timestampToTime } from "@/utils/dateUtil";
-import { Tickets } from "@element-plus/icons-vue";
 import modal from "@/plugins/modal";
 import tab from "@/plugins/tab";
-import {showConfirm} from "@/utils/common";
+import { showConfirm } from "@/utils/common";
 import auth from "@/plugins/auth";
-const userStore = useUserStore()
+
 const startList = ref([]);
-const paigongList = ref([]);
+const dispatch = ref([]);
 const pauseList = ref([]);
 const planList = ref([]);
 const chartData = ref({});
@@ -198,6 +259,7 @@ onMounted(() => {
   getServerData()
   getPlanList()
 });
+
 function getServerData() {
   // 模拟从服务器获取数据时的延时
   setTimeout(() => {
@@ -223,7 +285,7 @@ function getPlanList() {
     planList.value = response.data
   })
   getByStatus(1).then(response => {
-    paigongList.value = response.data
+    dispatch.value = response.data
   })
   getByStatus(2).then(response => {
     startList.value = response.data
@@ -244,7 +306,6 @@ function updatePlan(id, planCode, type){
     if (res.confirm) {
       const data = {'id':id, 'code':type}
       updateStatus(data).then(response => {
-        console.log(response)
         getPlanList()
       })
       modal.msgSuccess("操作成功")
@@ -275,4 +336,52 @@ function planProgress(plan){
   width: 100%;
   height: 300px;
 }
+.container {
+  background-color: #f1f1f1;
+  padding: 0 20rpx 20rpx 20rpx;
+  .content {
+    margin: 20rpx 0;
+    padding: 20rpx;
+    background-color: #ffffff;
+    border-radius: 10rpx;
+    .header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .title {
+        display: flex;
+        align-items: center;
+        .name {
+          font-size: 28rpx;
+          font-weight: bold;
+          margin-left: 16rpx;
+          color: #333333;
+        }
+      }
+    }
+    .flex-box {
+      margin-top: 20rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      font-size: 24rpx;
+    }
+    .text {
+      margin-top: 20rpx;
+    }
+    .remark {
+      margin-top: 20rpx;
+      display: flex;
+      align-items: center;
+      padding: 20rpx;
+      background-color: #f5f7f9;
+      border-radius: 10rpx;
+      font-size: 24rpx;
+      color: #555555;
+    }
+    .u-button {
+      height: 60rpx
+    }
+  }
+}
 </style>
diff --git a/src/static/images/icon/product.png b/src/static/images/icon/product.png
new file mode 100644
index 0000000000000000000000000000000000000000..57dcee0915a68d386d51c7af6d4188c25caf02f3
GIT binary patch
literal 691
zcmV;k0!;mhP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZrT}ebiR5*>5l|N`xQ5431_xW0Dp*2tksR>jE5v8Cm
zS%iv%LLefdWXL2A4na$oj3E}MxCuoaN(U7QI0%JQErJCXmx=^j)bb$Eg0>K83^jfC
z9*37Sd4Fo@2ZwvlednBa&OIOJDk5-gPGY)`lz|MwxF|`0LO~6v3Y7b|sl2|W>Oo)S
z(~4qUIYCyzw7^)@&vqOIM-+v(E4-knOekP_UIw=|C<)~L7bqg5nSl}V^J&!tusWGF
z)+xC{P7CZuTp`z3r$kXK02^Q;PF5Ro3J~CK5^kLFXY%GdeEkXUSD?}AmM7jeHxcL4
z5<F8E=OnhR`ApB9eY_nmZQ&dI*@nb0<QG93|91hWd4O})UrkCI#<cN_I);rFtTjAo
zv_J%mKr#-K$*yfjjA87MCS|*tOw?uH{{Tylw?97$>65Uw>FL)`!>=aHE(e?p8Qay2
z2gn1!!^?hsvjxw;!18MM%ng){Fm4<1NV^w?`r+kG|Jm8cp@0e7H7YXR<bv1HD7?zR
zsUzVG6<}+qAsk2W@!-KF$X|#Kcx=d9wY2Tk&RVmyP&LNuU}vTMT_jpM2>NNEYHOD=
zimSma^6y~rM>xCTgD{_k_;5s1EXuY~R77wH41*`>=yH3Z#iu&TP_djTRd)@AUXq6R
z6@l4hKe1gy!I@HZufIjHjt=sOeNLJVESOnsa*v`iJA@g1DueECN+R8$Jx$+TSIqPs
zCck>e8(*OTJJL^96w_*t0W07rp|H`~Wx)0#R+N|;ASI^#1VEx~TtiV+7G>F@QZI&|
ZfPdZKHru*ZJ)-~s002ovPDHLkV1j=NFBAX(

literal 0
HcmV?d00001