Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/styles/cus.scss

@@ -185,11 +185,13 @@
 .iaudit {
   background-color: #19A998;
   color:#FFFFFF;
+  border:none;
 }
 //已启动
 .istart {
   background-color: #1B9AEE;
   color: #FFFFFF;
+  border:none;
 }
 //已打回
 .iBack {
@@ -202,21 +204,26 @@
 .ialteration {
   background-color:#FFF7E6;
   color:#D46B08;
+  border:none;
 }
 //已提交
 .isubmit {
   background-color: #19A998;
   color:#FFFFFF;
+  border:none;
 }
 //已作废
 .icancellation {
   background-color: #F0F1F4;
   color: #666879;
+  border:none;
+
 }
 //已终止
 .ibreakup {
   background-color: #F0F1F4;
   color: #666879;
+  border:none;
 }
 
 //全部发货

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue

@@ -22,7 +22,7 @@ const queryParams = {
   id: undefined,
   name: undefined,
   mouldTypeId: undefined,
-  status: undefined,
+  status: 1,
 }
 
 const valueName: any = ref() //选中的值

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue

@@ -239,15 +239,15 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const openForm = (id: number) => {
-  router.push({ path: '/plan/edit', query: { id: id } })
+  router.push({ path: '/plan/planedit', query: { id: id } })
 }
 const openAdd = (id: number) => {
-  router.push({ path: '/plan/add' })
+  router.push({ path: '/plan/planadd' })
 }
 
 /** 添加/修改操作 */
 const openDetail = (id: number) => {
-  router.push({ path: '/plan/detail', query: { id: id } })
+  router.push({ path: '/plan/plandetail', query: { id: id } })
 }
 
 /** 导出按钮操作 */

mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue

@@ -220,9 +220,9 @@
             <td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
           </tr>
            <tr>
-            <td colspan="4">{{formData.creatorName}}</td>
-            <td colspan="3">{{formData.auditUserName}}</td>
-            <td colspan="3">{{formData.approveUserName}}</td>
+            <td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
           </tr>
         </tbody>
       </table>
@@ -374,9 +374,9 @@
               <td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
             </tr>
              <tr>
-              <td colspan="4">{{formData.creatorName}}</td>
-              <td colspan="3">{{formData.auditUserName}}</td>
-              <td colspan="3">{{formData.approveUserName}}</td>
+              <td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
+              <td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
             </tr>
           </tbody>
         </table>

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue

@@ -43,11 +43,11 @@
           <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['heli:purchase-order:create']">
             <Icon icon="ep:plus" class="mr-5px" /> 新增
           </el-button>
-          <el-button type="primary" plain @click="handleExportWithTax()" v-hasPermi="['heli:purchase-order:create']">
-            <Icon icon="ep:plus" class="mr-5px" /> 乘税率导出
+          <el-button type="success" plain @click="handleExportWithTax()" v-hasPermi="['heli:purchase-order:create']">
+            <Icon icon="ep:upload" class="mr-5px" /> 乘税率导出
           </el-button>
-          <el-button type="primary" plain @click="handleExport()" v-hasPermi="['heli:purchase-order:create']">
-            <Icon icon="ep:plus" class="mr-5px" /> 直接导出
+          <el-button type="success" plain @click="handleExport()" v-hasPermi="['heli:purchase-order:create']">
+            <Icon icon="ep:upload" class="mr-5px" /> 直接导出
           </el-button>
         </el-form-item>
       </el-form>