From 238595017057e4bc67393915140507785f45b195 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 31 一月 2024 14:24:47 +0800
Subject: [PATCH] add 追溯报表

---
 jcdm-ui/src/views/main/om/productionOrde/index.vue |   89 +++-----------------------------------------
 1 files changed, 7 insertions(+), 82 deletions(-)

diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 249fae6..50e3228 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -92,26 +92,7 @@
           v-hasPermi="['om:productionOrde:export']"
         >瀵煎嚭</el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-upload2"-->
-<!--          :disabled="move"-->
-<!--          size="mini"-->
-<!--          @click="moveUp(val => val, 'up')"-->
-<!--        >涓婄Щ</el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          :disabled="move"-->
-<!--          @click="moveUp(val => val, 'down')"-->
-<!--        >涓嬬Щ</el-button>-->
-<!--      </el-col>-->
+
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -150,85 +131,28 @@
         </el-table-column>
         <el-table-column label="鏈哄瀷" width="160" align="center" prop="typeZ">
         </el-table-column>
+
         <el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
         </el-table-column>
+
         <el-table-column label="浜у搧缂栧彿" width="150" align="center" prop="productCode">
         </el-table-column>
-<!--        <el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">-->
-<!--        </el-table-column>-->
+
         <el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
           </template>
         </el-table-column>
-<!--        <el-table-column label="宸ュ巶" align="center" prop="workshopCode">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="浠撳簱" align="center">-->
-<!--        </el-table-column>-->
+
         <el-table-column label="浜х嚎" align="center" prop="lineCode">
         </el-table-column>
-<!--        <el-table-column label="璁㈠崟绫诲瀷" align="center">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="ZWS" align="center">-->
-<!--        </el-table-column>-->
 
-<!--        <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="浜у搧BOM" width="140" align="center" prop="bomCode">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="宸ヨ壓閰嶆柟" width="140" align="center" prop="recipeCode">-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="瀹為檯鏁伴噺" align="center" prop="actualQty">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="瀹為檯涓婄嚎鏁伴噺" width="100" align="center" prop="actualOnlineQty">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="闇�姹傛棩鏈�" align="center" prop="demandDate" width="180">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="璁″垝寮�濮嬫椂闂�" width="160" align="center" prop="planStartTime">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="璁″垝缁撴潫鏃堕棿" width="160" align="center" prop="planEndTime">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="瀹為檯寮�濮嬫椂闂�" width="160" align="center" prop="actualStartTime">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="瀹為檯缁撴潫鏃堕棿" width="160" align="center" prop="actualEndTime">-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column width="160" label="鏇存柊鏃堕棿" align="center" prop="updateTime">-->
-<!--        </el-table-column>-->
         <el-table-column label="閫氱煡鍗曞埗鍗曚汉" width="80" align="center" prop="createUser">
         </el-table-column>
         <el-table-column width="160" label="閫氱煡鐢熸垚鏃ユ湡" align="center" prop="createTime">
         </el-table-column>
         <el-table-column label="鎴愬搧鎻忚堪" width="320" align="center" prop="productName">
         </el-table-column>
-<!--        <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="澶囨敞" width="100" align="center" prop="remarks">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="娴佹按鍙�" align="center" prop="streamNumber">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="瀹㈡埛" width="80" align="center" prop="custom">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column fixed="right" width="350" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">-->
-<!--          <template slot-scope="scope">-->
-<!--            &lt;!&ndash;  宸ュ崟鐘舵�侊紙1鍒涘缓銆�2宸插彂甯冦��3鐢熶骇涓��4宸插喕缁撱��5宸插畬宸ャ��6宸插叧闂級 &ndash;&gt;-->
-<!--            <el-button type="success" :disabled="scope.row.orderStatus !== '1'"  style="width: 72px" plain @click="handleCommand('3',scope.row.id)" size="mini">-->
-<!--              寮�濮�</el-button>-->
-<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '2' && scope.row.orderStatus !== '3'" v-if="scope.row.orderStatus !== '2'&&  scope.row.orderStatus !== '4'" plain @click="handleCommand('4',scope.row.id)" type="warning" size="mini">-->
-<!--              鍐荤粨</el-button>-->
-<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '4'" v-if="scope.row.orderStatus === '4'" plain @click="handleCommand('3',scope.row.id)" type="warning" size="mini">-->
-<!--              瑙e喕</el-button>-->
-<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '1'" plain @click="handleCommand('6',scope.row.id)" v-if="scope.row.orderStatus === '1'||scope.row.orderStatus === '3'||scope.row.orderStatus === '4'||scope.row.orderStatus === '5'" type="danger" size="mini">-->
-<!--              鍏抽棴</el-button>-->
-<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
-<!--              鍚敤</el-button>-->
-<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus === '4'||scope.row.orderStatus === '6'" v-if="scope.row.orderStatus !== '5'" @click="handleCommand('5',scope.row.id)" type="success" size="mini">-->
-<!--              瀹屾垚</el-button>-->
-<!--            <el-button style="width: 72px" :disabled="scope.row.orderStatus === '5'" v-if="scope.row.orderStatus === '5'" type="success" size="mini">宸插畬宸�</el-button>            <el-button style="width: 72px" :disabled="scope.row.orderStatus !== '6'" plain @click="handleCommand('1',scope.row.id)" v-if="scope.row.orderStatus === '6' " type="success" size="mini">-->
-<!--            鍚敤</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
       </el-table>
     </el-card>
 
@@ -398,7 +322,7 @@
 
 export default {
   name: "ProductionOrde",
-  dicts: ['order_state','year','month','day'],
+  dicts: ['order_state','year','month','day','subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
   components: {
     ItemSelect ,
   },
@@ -740,6 +664,7 @@
       }
 
     },
+
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.initWorkshop();

--
Gitblit v1.9.3