fix bug

src/views/erp/product/product/index.vue

@@ -52,6 +52,7 @@
       <el-tab-pane label="关键件" name="5" />
       <el-tab-pane label="工具" name="3" />
       <el-tab-pane label="耗材" name="4" />
+      <el-tab-pane label="办公室用品" name="6" />
       <el-tab-pane label="其他" name="0" />
     </el-tabs>
 

src/views/erp/sale/order/SaleOrderForm.vue

@@ -25,6 +25,17 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="交货时间" prop="planOutTime">
+            <el-date-picker
+              v-model="formData.planOutTime"
+              type="date"
+              value-format="x"
+              placeholder="选择交货时间"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="客户" prop="customerId">
             <el-select
@@ -176,6 +187,7 @@ const formData = ref({
   accountId: undefined,
   saleUserId: undefined,
   orderTime: undefined,
+  planOutTime: undefined,
   remark: undefined,
   fileUrl: '',
   discountPercent: 0,
@@ -276,6 +288,7 @@ const resetForm = () => {
     accountId: undefined,
     saleUserId: undefined,
     orderTime: undefined,
+    planOutTime: undefined,
     remark: undefined,
     fileUrl: undefined,
     discountPercent: 0,

src/views/erp/sale/order/index.vue

@@ -62,22 +62,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建人" prop="creator">
-        <el-select
-          v-model="queryParams.creator"
-          clearable
-          filterable
-          placeholder="请选择创建人"
-          class="!w-240px"
-        >
-          <el-option
-            v-for="item in userList"
-            :key="item.id"
-            :label="item.nickname"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
           <el-option
@@ -167,14 +152,14 @@
       <el-table-column min-width="180" label="订单单号" align="center" prop="no" />
       <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
       <el-table-column label="客户" align="center" prop="customerName" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
-        label="订单时间"
+        label="交货时间"
         align="center"
-        prop="orderTime"
+        prop="planOutTime"
         :formatter="dateFormatter2"
         width="120px"
       />
-      <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column
         label="总数量"
         align="center"
@@ -193,6 +178,13 @@
         prop="returnCount"
         :formatter="erpCountTableColumnFormatter"
       />
+      <el-table-column
+        label="订单时间"
+        align="center"
+        prop="orderTime"
+        :formatter="dateFormatter2"
+        width="120px"
+      />
       <el-table-column
         label="金额合计"
         align="center"
@@ -216,6 +208,7 @@
           <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column label="操作" align="center" fixed="right" min-width="260">
         <template #default="scope">
           <el-button

src/views/mes/producereport/AdminIndex.vue

@@ -78,6 +78,7 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="制浆" name="zhijiang" />
       <el-tab-pane label="成型" name="chengxing" />
       <el-tab-pane label="烘干" name="honggan" />
       <el-tab-pane label="转移" name="zhuanyi" />