Merge remote-tracking branch 'origin/0317迭代' into 0317迭代

src/views/business/drawingRatify/index.vue

@@ -149,11 +149,15 @@ const patternLabels = ref([
     value: "替换",
     label: "替换",
   },
+  {
+    value: "作废",
+    label: "作废",
+  }
 ]);
 const data = reactive({
   queryParams: {
     status: 1,
-    abandoned: 0,
+    // abandoned: 0,
     pageNum: 1,
     pageSize: 10,
   },

src/views/business/productionPlan/index.vue

@@ -33,14 +33,16 @@
     <!-- 搜索区 -->
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="计划单号：">
-        <el-input placeholder="请输入计划单号" @keydown.enter.prevent @keyup.enter="handleQuery" clearable v-model.trim="queryParams.productionPlanNo" style="width: 160px" />
+        <el-input placeholder="请输入计划单号" @keydown.enter.prevent @keyup.enter="handleQuery" clearable
+          v-model.trim="queryParams.productionPlanNo" style="width: 160px" />
       </el-form-item>
       <!-- <el-form-item label="状态：">
         <el-select-v2 v-model="queryParams.status" clearable filterable :options="plan_status" placeholder="全部状态" @change="handleQuery" style="width: 120px" />
       </el-form-item> -->
       <el-form-item>
         <el-button type="info" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button type="primary" icon="Switch" @click="handleSyncP2Plan" v-hasPermi="['business:productionPlan:query']">同步P2生产计划</el-button>
+        <el-button type="primary" icon="Switch" @click="handleSyncP2Plan"
+          v-hasPermi="['business:productionPlan:query']">同步P2生产计划</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表区 -->
@@ -66,6 +68,11 @@
           <el-table-column label="累计投产量" prop="pickUpQuantity" width="80" align="center" />
           <el-table-column label="累计投产批数" prop="lotTotalNumber" width="90" align="center" />
           <el-table-column label="库位" prop="storageLocation" width="80" align="center" />
+          <el-table-column label="是否废品回用" prop="" width="90" align="center">
+            <template #default="scope">
+              {{ scope.row.planType == 'HY' ? '是' : '否' }}
+            </template>
+          </el-table-column>
           <el-table-column label="领料部门" prop="requisitionDepartmentName" align="center" fixed="right">
             <template #default="scope">
               <span>{{ scope.row.requisitionDepartmentName }}</span>
@@ -86,7 +93,8 @@
         </el-table>
       </div>
     </div>
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 表单 -->
     <!-- <productionPlan-form ref="productionPlanRef" :get-list="getList"></productionPlan-form> -->
@@ -158,19 +166,20 @@ const handleSyncP2Plan = () => {
   background-color: #f2f2f2;
   border-radius: 10px;
 
-  > div:first-child {
+  >div:first-child {
     display: flex;
     flex: 2;
     justify-content: center;
     align-items: center;
   }
-  > div.dashboard-total-item-label {
+
+  >div.dashboard-total-item-label {
     display: flex;
     flex: 3;
     flex-direction: column;
     justify-content: center;
 
-    > span {
+    >span {
       display: block;
       width: 60%;
       text-align: center;
@@ -180,6 +189,7 @@ const handleSyncP2Plan = () => {
         margin-bottom: 4px;
         letter-spacing: 2px;
       }
+
       &:last-child {
         font-weight: bold;
         font-size: 24px;
@@ -187,16 +197,20 @@ const handleSyncP2Plan = () => {
     }
   }
 }
-.dashboard-total-item > .dashboard-total-item-label > span:last-child {
+
+.dashboard-total-item>.dashboard-total-item-label>span:last-child {
   color: #444444;
 }
-.dashboard-total-item > .dashboard-total-item-label > span:last-child > span:first-child {
+
+.dashboard-total-item>.dashboard-total-item-label>span:last-child>span:first-child {
   margin-right: 8px;
 }
-.dashboard-total-item > .dashboard-total-item-label > span:last-child > span:last-child {
+
+.dashboard-total-item>.dashboard-total-item-label>span:last-child>span:last-child {
   color: #4367df;
 }
-.dashboard-total-item > .number-label {
+
+.dashboard-total-item>.number-label {
   font-size: 40px;
   margin-left: 16px;
   font-weight: bold;