From 3a4041f3eef38f38fa03d6305bea9faead06c133 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 10 五月 2024 16:36:43 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-report-preparation.vue | 1
src/components/view/b1-inspect-order-plan.vue | 6 +-
static/js/menu.js | 9 +-
src/components/view/b1-unpass.vue | 127 ++++++++++++++++++++++++++++++++++++++++++
src/assets/api/controller.js | 4 +
5 files changed, 139 insertions(+), 8 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 6c48d54..8dac067 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -24,6 +24,7 @@
informationNotification,
performanceShift,
auxiliaryWorkingHours,
+ unPass,
}
}
@@ -271,3 +272,6 @@
insertAuxiliaryWorkingHours:"/auxiliaryWorkingHours/insertAuxiliaryWorkingHours",//鏂板杈呭姪宸ユ椂
}
+const unPass = {
+ pageInsUnPass:"/unPass/pageInsUnPass", // 鏌ヨ涓嶅悎鏍兼牱鍝佹暟鎹�
+}
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 867b6f1..56ea018 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -189,7 +189,7 @@
<script>
import ValueTable from '../tool/value-table.vue'
- import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
+ import Inspection from '../do/b1-inspect-order-plan/Inspection.vue'
import {
getYearAndMonthAndDays
} from '../../util/date'
@@ -245,9 +245,9 @@
font: '澶嶆牳',
type: 'text',
method: 'handleReview',
- /* disabFun: (row, index) => {
+ disabFun: (row, index) => {
return row.userId == null || row.insState != 3
- } */
+ }
}, {
id: '',
font: '璁ら',
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 5ffc79a..3a85cb3 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -356,7 +356,6 @@
.replace(/ /g, " ");
this.claimVisible = true;
}
-
}).catch(error => {
console.error(error)
})
diff --git a/src/components/view/b1-unpass.vue b/src/components/view/b1-unpass.vue
new file mode 100644
index 0000000..dd63b44
--- /dev/null
+++ b/src/components/view/b1-unpass.vue
@@ -0,0 +1,127 @@
+<style scoped>
+ .title {
+ height: 60px;
+ line-height: 60px;
+ }
+
+ .search {
+ background-color: #fff;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ }
+ .search_thing {
+ display: flex;
+ align-items: center;
+ height: 50px;
+ }
+ .search_label {
+ width: 120px;
+ font-size: 14px;
+ text-align: right;
+ }
+
+ .search_input {
+ width: calc(100% - 120px);
+ }
+ .table {
+ margin-top: 10px;
+ background-color: #fff;
+ width: calc(100% - 40px);
+ height: calc(100% - 60px - 80px - 10px - 40px);
+ padding: 20px;
+ }
+
+</style>
+<template>
+ <div class="below-standard-main">
+ <div style="width: 100%;height: 100%;">
+ <div>
+ <el-row class="title">
+ <el-col :span="12" style="padding-left: 20px;">涓嶅悎鏍肩鐞�</el-col>
+ </el-row>
+ </div>
+ <div class="search">
+ <div class="search_thing">
+ <div class="search_label">瑙勬牸鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="componentData.entity.model" @keyup.enter.native="refreshTable()"></el-input></div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="componentData.entity.sample"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </div>
+ </div>
+ <div class="search_thing" style="padding-left: 30px;">
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ </div>
+ </div>
+ <div class="table">
+ <ValueTable ref="ValueTable" :url="$api.unPass.pageInsUnPass" :componentData="componentData"
+ :key="upIndex" />
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+ import ValueTable from '../tool/value-table.vue'
+ import Word from '../tool/word.vue'
+ import file from '../../util/file';
+ import {
+ convertToHtml
+ } from 'mammoth';
+export default {
+ components: {
+ ValueTable,
+ Word,
+ },
+ data() {
+ return {
+ componentData: {
+ entity: {
+ sample: null,
+ model: null,
+ },
+ isIndex: true,
+ showSelect: false,
+ select: false,
+ do: [
+ ],
+ linkEvent: {
+ // code: {
+ // method: 'selectAllByOne'
+ // }
+ },
+
+ },
+ entityCopy: {},
+ upIndex: 0,
+ statusList: [],
+
+ }
+ },
+ mounted() {
+ this.entityCopy = this.HaveJson(this.componentData.entity)
+ this.getPower()
+ },
+ methods :{
+ refreshTable() {
+ this.$refs['ValueTable'].selectList()
+ },
+ refresh() {
+ this.componentData.entity = this.HaveJson(this.entityCopy)
+ this.upIndex++
+ },
+ // 鏉冮檺鍒嗛厤
+ getPower(radio) {
+ let power = JSON.parse(sessionStorage.getItem('power'))
+ },
+ }
+}
+</script>
+
diff --git a/static/js/menu.js b/static/js/menu.js
index 831a1ca..4f54acf 100644
--- a/static/js/menu.js
+++ b/static/js/menu.js
@@ -13,7 +13,7 @@
{
v: "涓氬姟绠＄悊",
i: "font icon-kexueyanjiuheshiyankaifa",
- p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
+ p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport pageInsUnPass",
c: [{
v: "妫�楠屼笅鍗�",
i: "font icon-erjidaohang",
@@ -39,12 +39,13 @@
i: "font icon-erjidaohang",
u: "b1-sample",
p: "selectWarehouse"
- }, {
+ },{
v: "涓嶅悎鏍肩鐞�",
i: "font icon-erjidaohang",
- u: "",
+ u: "b1-unpass",
p: ""
- }]
+ }
+ ]
},
{
v: "鏍囧噯闆�",
--
Gitblit v1.9.3