From d245609c9e928670961ae011dd934c0f34cbbfd9 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 18 八月 2023 17:46:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/icon.vue | 3
src/components/view/Processingproducts.vue | 192 ++++++++
src/components/view/processInspection.vue | 20
src/router/index.js | 5
src/view/index.vue | 162 ++++++
src/assets/api/controller.js | 21
src/components/view/sale.vue | 196 +++++++
src/components/view/raw-ins.vue | 4
src/components/view/record-content.vue | 236 +++++++++
src/main.js | 125 ++--
src/App.vue | 29 +
src/components/view/rawInsDetail.vue | 18
src/components/view/rawUnqualified/raw.vue | 390 +++++++++-------
src/components/view/unqualifiedManagement.vue | 4
14 files changed, 1,118 insertions(+), 287 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 1783dc5..a5349ab 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -164,7 +164,7 @@
border: 0;
}
/* 鍏ㄥ眬妯℃�佹鏍峰紡 */
-.el-dialog__header {
+.el-dialog__header,.el-message-box__header {
box-sizing: border-box;
height: 56px;
border-bottom: 1px solid rgb(238, 238, 238);
@@ -182,8 +182,24 @@
margin-left: 32px;
margin-right: 8.5px;
}
+
+.el-message-box__header::before {
+ content: "";
+ display: inline-block;
+ width: 4px;
+ height: 30.24px;
+ background: rgb(0, 95, 201);
+ border-radius: 10px;
+ margin-left: 20px;
+ margin-right: 8.5px;
+}
+
.el-dialog__header .el-dialog__title {
font-size: 16px !important;
+}
+
+.el-dialog__footer{
+ padding-right: 40px;
}
.el-dialog__footer .el-button * {
@@ -197,6 +213,17 @@
padding: 0 14px;
}
+.el-message-box__btns .el-button * {
+ font-size: 14px !important;
+}
+
+.el-message-box__btns .el-button{
+ height: 36px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 14px;
+}
+
.el-button--primary {
background: #004ea2;
}
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 1d224cf..eeeb6ea 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -8,6 +8,11 @@
selectAllOrder: "/orders/selectAllOrder", //鏌ヨ鎵�鏈夎鍗曞垪琛�
selectOrderById: "/orders/selectOrderById", //鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏
}
+//鎶�鏈鐞�-璁㈠崟Bom
+const purchaseorder= {
+ selectAllOrder:"/orders/selectAllOrder",
+ compile:"/orders/compile" //缂栧埗
+}
// 鍘熸潗鏂欐楠�
const raw = {
selectRawInspectsList: "rawInspect/selectRawInspectsList", //鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
@@ -18,6 +23,10 @@
selectSpBySt: "/rawInspect/selectSpBySt", //鏍规嵁鏉愭枡id鏌ヨ鎵�鏈夊瀷鍙�,
addRawInspects: "/rawInspect/addRawInspects"
}
+//涓嶅悎鏍煎師鏉愭枡
+const unqualifiedaa ={
+ selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList"
+}
// 鎴愬搧妫�楠�
const finishedIns = {
@@ -25,6 +34,7 @@
// listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
finishedInspectUser: "/finished-inspect/page_user", //鑾峰彇鎵�鏈変富鏈哄伐
projectListByfinishId: "/inspection-item/list_user", //鏍规嵁id鏌ヨ鎵�鏈夐」鐩�
+
}
// QMS瀹為獙瀹ょ鐞�
@@ -38,6 +48,10 @@
tableDeviceList: "/device/table_list", // 瀹為獙瀹ゆā鍧楄〃鏍兼暟鎹�
deleteDevice: "/device/delete", // 鍒犻櫎瀹為獙瀹よ澶�
deleteIdorFather: "/device/deleteIdorFather" // 鍒犻櫎鏍戞ā鍧楁暟鎹�
+}
+//涓嶅悎鏍煎搧澶勭疆
+const dispose = {
+ gettable:"/opinion/list_page"
}
// QMS璁￠噺绠＄悊
@@ -56,9 +70,16 @@
...laboratory,
...measure,
...finishedIns,
+ ...unqualifiedaa,
+ ...dispose,
+ ...purchaseorder,
selectSaleList: "sale/selectSaleList", //鏌ヨ閿�鍞崟鍒楄〃
selectSaleDatilById: "sale/selectSaleDatilById", //鏍规嵁閿�鍞崟id鏌ョ湅璇︽儏,
addSale: "sale/addSale", //鏂板閿�鍞崟
+ saleCheck: "sale/check", //瀹℃牳閿�鍞崟
+ updateSaleById: "sale/updateSaleById", //鏍规嵁閿�鍞崟id淇敼璇︽儏淇℃伅
+ delSale: "sale/delSale", //鏍规嵁閿�鍞崟id鍒犻櫎
+ delAllSale: "sale/delAllSale", //鎵归噺鍒犻櫎閿�鍞崟
}
diff --git a/src/components/tool/icon.vue b/src/components/tool/icon.vue
index 090df33..1f72418 100644
--- a/src/components/tool/icon.vue
+++ b/src/components/tool/icon.vue
@@ -1,3 +1,6 @@
+
+
+
<style scoped>
::-webkit-scrollbar {
width: 8px;
diff --git a/src/components/view/Processingproducts.vue b/src/components/view/Processingproducts.vue
new file mode 100644
index 0000000..19630f9
--- /dev/null
+++ b/src/components/view/Processingproducts.vue
@@ -0,0 +1,192 @@
+<template>
+ <div>
+ <div class="article-main" style="overflow: hidden;">
+ <el-row>
+ <el-col :span="12" style="line-height: 32px;">涓嶅悎鏍煎搧澶勭疆</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button icon="el-icon-download" size="mini" @click="()=>{}">瀵煎嚭</el-button>
+ </el-col>
+ </el-row>
+ <div>
+
+ <div style="margin-top: 10px;">
+ <el-card shadow="hover" class="margin-30">
+ <el-form ref="form" :model="searchform" label-width="80px">
+ <el-row :gutter="25">
+ <el-col :span="7" >
+ <el-form-item label="浜у搧鍚嶇О:">
+ <el-input v-model="searchform.name" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7" >
+ <el-form-item label="瑙勬牸鍨嬪彿:">
+ <el-input v-model="searchform.stude" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-button size="default" @click="">閲嶇疆</el-button>
+ <el-button type="primary" size="default" style="background:0, 78, 162 ;" @click="getDetailInfo">鏌ヨ</el-button>
+
+ </el-col>
+ </el-row>
+ </el-form>
+ </el-card>
+ </div>
+
+ <div style="margin-top: 30px;">
+ <el-card shadow="hover" class="margin-30">
+ <el-table
+ ref="multipleTable"
+ :data="tableData"
+ tooltip-effect="dark"
+ style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column
+ type="selection"
+ width="55">
+ </el-table-column>
+ <el-table-column
+ label="鏃ユ湡"
+ width="120">
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="濮撳悕"
+ width="120">
+ </el-table-column>
+ <el-table-column
+ prop="address"
+ label="鍦板潃"
+ show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </el-card>
+ <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="4"
+ :page-sizes="[1,10, 20, 30, 50]"
+ :page-size="4"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="countSize">
+ </el-pagination>
+ </el-col>
+ </div>
+ </div>
+ </div>
+ </div>
+</template>
+
+
+
+<script>
+export default {
+ data() {
+ return {
+ searchform:{
+ name:'',
+ stude:''
+ },
+ tableData: [
+ {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-04',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-08',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-06',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-07',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }
+ ],
+ pageSize:3,
+ countSize:1,
+ currentPage:2,
+ multipleSelection:''
+ }
+ },
+ created(){
+ // this.getDetailInfo()
+ },
+ methods:{
+ handleSelectionChange(val) {
+ // console.log(val);
+ // this.multipleSelection = val;
+ },
+ handleSizeChange(val) {
+ console.log(val);
+ // this.pageSize = 1
+ // this.countSize= val
+ // this.getDetailInfo()
+ },
+ handleCurrentChange(val) {
+ // this.pageSize = val
+ // this.getDetailInfo()
+ },
+ getDetailInfo() {
+ let aa = [0,5]
+ aa.map(el =>{
+ console.log(el);
+ })
+ console.log(this.searchform.name);
+ console.log(this.searchform.stude);
+ // this.tableData
+ // this.axios.get(this.$api.url.gettable,{
+ // params:{pageNo:10,
+ // pageSize:1,
+ // productName:this.searchform.name,
+ // specificationsModels:this.searchform.stude
+ // },
+ // }).then(res=>{
+ // console.log(res);
+ // this.tableData = res.data.row
+ // })
+ }
+}}
+ // methods:{
+ // toggleSelection(rows) {
+ // if (rows) {
+ // rows.forEach(row => {
+ // this.$refs.multipleTable.toggleRowSelection(row);
+ // });
+ // } else {
+ // this.$refs.multipleTable.clearSelection();
+ // }
+ // },
+
+ // }
+ // }
+
+
+</script>
+<style scoped>
+.card-2{
+ display: flex;
+ margin-top: 30px;
+}
+
+.ssss{
+ background-color: #fff;
+}
+</style>
diff --git a/src/components/view/processInspection.vue b/src/components/view/processInspection.vue
index 8f116db..1ab23ed 100644
--- a/src/components/view/processInspection.vue
+++ b/src/components/view/processInspection.vue
@@ -123,7 +123,7 @@
>
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleClick(scope.row)">鏌ョ湅</el-button>
- <el-button type="text" size="small">鎵撳嵃</el-button>
+ <el-button type="text" size="small" style="margin-left: 0;">鎵撳嵃</el-button>
</template>
</el-table-column>
</el-table>
@@ -157,7 +157,7 @@
<el-row :gutter="450">
<el-col :span="5">
<el-form-item label="璁㈠崟鍙凤細">
- <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
+ <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="璇疯緭鍏ヨ鍗曞彿" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -278,11 +278,11 @@
</el-table>
</div>
</div>
-
+
</div>
</template>
-
-
+
+
<script>
export default {
data(){
@@ -324,7 +324,7 @@
operation: ''
}],
currentPage: 1, // 褰撳墠椤电爜
- pageSize: 100,
+ pageSize: 100,
showAddPage: false,
addInspectionform: [{
number: '',
@@ -374,14 +374,14 @@
this.showAddPage=true
}
}
-
+
}
</script>
-
+
<style>
.title{
padding: 12px;
-
+
}
.nav{
display: flex;
@@ -432,4 +432,4 @@
background-color: #fff;
padding: 10px 12px;
}
- </style>
\ No newline at end of file
+ </style>
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
index ed319c6..b2dfefe 100644
--- a/src/components/view/raw-ins.vue
+++ b/src/components/view/raw-ins.vue
@@ -171,13 +171,13 @@
formTime: null,
createTime: null,
insState: 2,
- judgeState: 2
+ judgeState: 10
},
tableData: [],
selects: [],
currentPage: 1,
countSize: 0,
- pageSize: 10
+ pageSize: 2
}
},
props:['goDetail'],
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index cfb744d..7676e68 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -89,7 +89,7 @@
<el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.name"></el-option>
</el-select>
</el-form-item>
-
+
</el-col>
<el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿:">
@@ -134,13 +134,13 @@
</el-form-item>
</el-col>
<el-col :span="3">
- <el-form-item v-show="detailId===null" label="" label-width="100px">
+ <el-form-item v-show="detailId===null" label="" label-width="50px">
<el-button @click="addNewRawInspect">淇濆瓨鎻愪氦</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
-
+
<el-col :span="7">
<el-form-item v-show="detailId!==null" label="鎶ユ鏃ユ湡:">
<el-input :disabled="detailId!==null" v-model="detailInfo.createTime"></el-input>
@@ -151,7 +151,7 @@
<el-input :disabled="detailId!==null" v-model="detailInfo.userName"></el-input>
</el-form-item>
</el-col>
-
+
</el-row>
</el-form>
<!-- <el-form v-show="detailId ===null" v-model="rawInsParams" label-position="right" label-width="120px" >
@@ -190,7 +190,7 @@
<el-input placeholder="浜у搧缂栫爜" disabled v-model="code"></el-input>
</el-form-item>
</el-col>
-
+
</el-row>
<el-row>
<el-col :span="7">
@@ -345,7 +345,7 @@
this.getDetailInfo()
}else{
this.getOptions()
- }
+ }
},
mounted(){
},
@@ -422,9 +422,9 @@
this.getDetailInfo()
},
async getOptions() {
- // const {data} = await this.$axios.get(this.$api.url.listMaterial)
+ // const {data} = await this.$axios.get(this.$api.url.listMaterial)
// this.materialOptions = data
- const {data} = await this.$axios.get(this.$api.url.selectRawMaterial)
+ const {data} = await this.$axios.get(this.$api.url.selectRawMaterial)
this.materialOptions = data
console.log(this.materialOptions)
},
@@ -436,7 +436,7 @@
this.detailInfo.code = item.code
this.$axios.get(this.$api.url.selectSpBySt,{params:{id:item.id}}).then(res=>{
this.specificationOptions= res.data
- })
+ })
}
})
}
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
index 0293cbc..847f696 100644
--- a/src/components/view/rawUnqualified/raw.vue
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -4,7 +4,7 @@
max-height: 100%;
display: flex;
flex-direction: column;
- overflow-y: scroll;
+ /* overflow-y: scroll; */
}
.unqualifiedBox .title .el-button {
height: 32px;
@@ -16,7 +16,7 @@
margin-bottom: 10px;
padding: 0 20px;
}
-/* 鏉′欢鏌ヨ澶撮儴鏍峰紡 */
+<!-- /* 鏉′欢鏌ヨ澶撮儴鏍峰紡 */ -->
.choose {
padding: 21px 24px;
display: flex;
@@ -25,7 +25,7 @@
border-bottom: 3px solid rgb(245, 247, 251);
}
- .choose * {
+ .choose {
font-size: 14px;
}
@@ -35,193 +35,237 @@
box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
padding: 0 12px;
}
- /* 涓嶅悎鏍艰〃鏍兼牱寮� */
+ <!-- /* 涓嶅悎鏍艰〃鏍兼牱寮� */
.unqualifiedTable{
flex: 1;
background: #fff;
margin-top: 11px;
padding: 23px 21px;
}
+ .tableno{
+ margin-top: 30px;
+ }
</style>
<template>
-<div class="unqualifiedBox">
- <div class="title">
- <el-row>
- <el-col :span="12" style="line-height: 32px;">鍘熸潗鏂欎笉鍚堟牸</el-col>
- <el-col :span="12" style="text-align: right;">
- <el-button icon="el-icon-download" @click="()=>{}">瀵煎嚭</el-button>
- </el-col>
- </el-row>
+
+ <div class="unqualifiedBox">
+ <el-row>
+ <el-col :span="12" style="line-height: 32px;">鍘熸潗鏂欎笉鍚堟牸</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button icon="el-icon-download" size="mini" @click="()=>{}">瀵煎嚭</el-button>
+ </el-col>
+ </el-row>
+ <div style="margin-top: 10px;">
+ <el-card shadow="hover" class="margin-30" style="height: 80px;">
+
+ <div class="choose" >
+ <span>澶勭悊鐘舵�侊細</span>
+ <el-select v-model="search.insState" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-option label="宸插鐞�" :value="2"></el-option>
+ <el-option label="寰呭鐞�" :value="0"></el-option>
+ </el-select>
+ <span>鏉ユ枡鏃ユ湡锛�</span>
+ <el-date-picker v-model="search.createTime" size="small" placeholder="璇疯緭鍏�"
+ style="width: 224px;margin-right: 30px;" clearable value-format="yyyy-MM-dd"></el-date-picker>
+ <span>渚涘簲鍟嗭細</span>
+ <el-select v-model="search.insState" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-option label="鍏ㄩ儴" :value="2"></el-option>
+ <el-option label="鏈娴�" :value="0"></el-option>
+ <el-option label="宸叉娴�" :value="1"></el-option>
+ </el-select>
+ <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"><span>鏌�
+ 璇�</span></el-button>
+
+ </div>
+ </el-card>
</div>
- <div class="choose">
- <span>澶勭悊鐘舵�侊細</span>
- <el-select v-model="search.insState" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="宸插鐞�" :value="2"></el-option>
- <el-option label="寰呭鐞�" :value="0"></el-option>
- </el-select>
- <span>鏉ユ枡鏃ユ湡锛�</span>
- <el-date-picker v-model="search.createTime" size="small" placeholder="璇疯緭鍏�"
- style="width: 224px;margin-right: 30px;" clearable value-format="yyyy-MM-dd"></el-date-picker>
- <span>渚涘簲鍟嗭細</span>
- <el-select v-model="search.insState" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
- <el-option label="鍏ㄩ儴" :value="2"></el-option>
- <el-option label="鏈娴�" :value="0"></el-option>
- <el-option label="宸叉娴�" :value="1"></el-option>
- </el-select>
- <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
- <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"><span>鏌�
- 璇�</span></el-button>
+ <div class="tableno" style="height:300px">
+ <!-- <el-table :data=" unqualifiedTable" border style ="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
+ max-height="calc(100% - 50px)" row-key="id"
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> -->
+ <el-card shadow="hover" class="margin-30">
+
+ <el-table :data=" unqualifiedTable" border ref="multipleTable" tooltip-effect="dark"
+ style="width: 100%" @selection-change="handleSelectionChange">
+
+ <el-table-column
+ type="selection"
+ width="50">
+ </el-table-column>
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="鏉ユ枡鏃ユ湡"
+ label="鏉ユ枡鏃ユ湡"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="reason"
+ label="缂洪櫡鍚嶇О"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="material_code"
+ label="鏉愭枡缂栫爜"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="id"
+ label="鏉愭枡鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ prop="specifications_model"
+ label="瑙勬牸鍨嬪彿"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="unit"
+ label="鍗曚綅"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="quantity"
+ label="鏁伴噺"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="鎶ユ鏃ユ湡"
+ label="鎶ユ鏃ユ湡"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鎶ユ浜�"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="鎶ユ鏃ユ湡"
+ label="鎶ユ鏃ユ湡"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="deal_state"
+ label="澶勭悊鐘舵��"
+ width="100">
+ <template slot-scope="scope">
+ <span style="color:#34BD66;" v-if="scope.row.deal_state==1">宸插鐞�</span>
+ <span style="color:#E84738;" v-else-if="scope.row.deal_state==0">寰呭鐞�</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="deal_reasult"
+ label="澶勭悊缁撴灉"
+ width="100">
+
+ <template slot-scope="scope">
+ <span style="color:#34BD66;" v-if="scope.row.deal_reasult==1">涓嶉�氳繃</span>
+ <span style="color:#E84738;" v-else-if="scope.row.deal_reasult==0">閫氳繃</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ width="100"
+ >
+ <template slot-scope="scope">
+ <div style="display: flex;">
+ <el-button type="text" siae="small" size="mini">璇勫</el-button>
+ <el-button type="text" siae="small" size="mini" style=" color:87, 138, 193 ;" @click="">鏌ョ湅</el-button>
+ </div>
+ </template>
+ </el-table-column>
+
+
+ </el-table>
+ </el-card>
+ <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="currentPage"
+ :page-sizes="[1,10, 20, 30, 50]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="countSize">
+ </el-pagination>
+ </el-col>
</div>
- <div class="unqualifiedTable">
- <el-table :data="unqualifiedData" height="620">
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
- <el-table-column
- type="index"
- label="搴忓彿"
- width="60">
- </el-table-column>
- <el-table-column
- prop="name"
- label="缂洪櫡鍚嶇О"
- width="97">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鏉愭枡缂栫爜"
- width="141">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鏉愭枡鍚嶇О"
- width="214">
- </el-table-column>
- <el-table-column
- prop="address"
- label="瑙勬牸鍨嬪彿">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍗曚綅"
- width="250">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鏁伴噺"
- width="75">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎶ユ鏃ユ湡"
- width="128">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎶ユ浜�"
- width="78">
- </el-table-column>
- <el-table-column
- prop="address"
- label="澶勭悊鏃ユ湡"
- width="120">
- </el-table-column>
- <el-table-column
- prop="address"
- label="澶勭悊鐘舵��"
- width="100">
- </el-table-column>
- <el-table-column
- prop="address"
- label="澶勭悊缁撴灉"
- width="100">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鎿嶄綔"
- width="118">
- </el-table-column>
- </el-table>
- <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
- <el-pagination
- :current-page="currentPage"
- :page-sizes="[10, 20, 30, 50]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="countSize">
- </el-pagination>
- </el-col>
- </div>
-</div>
+ </div>
+
</template>
<script>
+
export default {
data() {
+
return {
- // 鎼滅储鏉′欢
- search:{},
- unqualifiedData:[
- {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }
- ],
- countSize:1,
- pageSize:10,
- currentPage:1
+ search:{
+ formTime: "null",
+ deal_state:2,
+ deal_reasult:2,
+ },
+ unqualifiedTable:[],
+ // articlelist:[] ,
+ selects:[],
+ countSize: 0,
+ pageSize: 2,
+ currentPage: 10
+
+
}
},
+ props:['godata'],
+ created(){
+ this.getDetailInfo()
+ },
+ mounted() {
+ this.getDetailInfo()
+ },
+ methods:{
+
+ handleSizeChange(val) {
+ this.pageSize = 1
+ this.countSize= val
+ this.getDetailInfo()
+ },
+ handleCurrentChange(val) {
+ this.pageSize = val
+ this.getDetailInfo()
+ },
+
+ getDetailInfo() {
+ // console.log(this.$api.url.selectUnRawInspectsList);
+
+ this.axios.get(this.$api.url.selectUnRawInspectsList, {
+ params:{countSize:this.currentPage, pageSize:this.pageSize},
+ // pageSize: this.currentPage,
+ // countSize: this.pageSize,
+ // formTime: this.search.formTime,
+ // deal_state: this.search. deal_state,
+ // deal_reasult: this.search.deal_reasult,
+ }).then(res=>{
+ // console.log(res);
+ this.unqualifiedTable = res.data.row
+ // console.log(this.unqualifiedTable);
+ // this.countSize = res.data.count
+ // console.log(111);
+
+ })
+ },
+ changeShowDetail({id}){
+ this.godata()
+
+ }
+ }
}
-</script>
\ No newline at end of file
+
+</script>
+
+
+
+
diff --git a/src/components/view/record-content.vue b/src/components/view/record-content.vue
new file mode 100644
index 0000000..88d9fb3
--- /dev/null
+++ b/src/components/view/record-content.vue
@@ -0,0 +1,236 @@
+<style scoped>
+ .title .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+ }
+
+ .title * {
+ font-size: 16px;
+ }
+
+ .choose {
+ padding: 21px 24px;
+ display: flex;
+ align-items: center;
+ background-color: #fff;
+ border-bottom: 3px solid rgb(245, 247, 251);
+ }
+
+ .choose * {
+ font-size: 14px;
+ }
+
+ .choose .el-button {
+ height: 32px;
+ border: 1px solid rgba(190, 190, 190, 0.44);
+ box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
+ padding: 0 12px;
+ }
+
+ .thing {
+ width: calc(100% - 44px);
+ height: calc(100% - 42px - 82px - 66px);
+ background-color: #fff;
+ overflow: auto;
+ padding: 33px 22px;
+ }
+
+ .table_do {
+ color: #004ea0;
+ cursor: pointer;
+ }
+</style>
+<style>
+ .record_content .title .el-button * {
+ font-size: 14px;
+ }
+
+ .record_content .title .el-button--default {
+ color: #004EA2;
+ }
+
+ .record_content .thing * {
+ font-size: 14px;
+ }
+
+ .record_content .has-gutter .el-table__cell {
+ background-color: #F0F1F5 !important;
+ color: #333;
+ }
+
+ .record_content .has-gutter .el-table__cell .cell {
+ font-size: 16px;
+ font-weight: 500;
+ }
+
+ .record_content .cell {
+ color: #333;
+ padding-left: 17px !important;
+ }
+
+ .record_content .el-table__body-wrapper {
+ height: 100%;
+ }
+
+ .raw_ins .el-table__body {
+ height: 100%;
+ }
+</style>
+
+<template>
+ <div class="record_content">
+ <div class="title">
+ <el-row>
+ <el-col :span="12" style="line-height: 32px;">璁板綍鍐呭缁存姢</el-col>
+ <el-col :span="12" style="text-align: right;">
+ <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;">鏂板</el-button>
+ <el-button icon="el-icon-edit-outline">淇敼</el-button>
+ <el-button icon="el-icon-delete">鍒犻櫎</el-button>
+ </el-col>
+ </el-row>
+ </div>
+ <div class="choose">
+ <span>绫诲瀷锛�</span>
+ <el-select v-model="search.type" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-option label="姗¤兌杩炴帴鍣�" :value="0"></el-option>
+ <el-option label="閲戝睘杩炴帴鍣�" :value="1"></el-option>
+ <el-option label="婀挎彃鎷旂數杩炴帴鍣�" :value="2"></el-option>
+ <el-option label="鍒嗘敮缁勪欢" :value="3"></el-option>
+ </el-select>
+ <span>宸ュ簭锛�</span>
+ <el-select v-model="search.name" size="small" placeholder="璇烽�夋嫨" style="width: 224px;margin-right: 30px;">
+ <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
+ </el-select>
+ <el-button size="mini" @click="clean()"><span>閲� 缃�</span></el-button>
+ <el-button size="mini" type="primary" style="background: #004EA2;"><span>鏌�
+ 璇�</span></el-button>
+ </div>
+ <div class="thing">
+ <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
+ max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all
+ :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id">
+ <el-table-column type="selection" width="50">
+ </el-table-column>
+ <el-table-column type="index" label="搴忓彿" width="70">
+ </el-table-column>
+ <el-table-column prop="name" label="宸ュ簭">
+ <template slot-scope="scope">
+ <span>
+ <font>{{scope.row.ids}}</font>{{scope.row.name}}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="address" label="澶囨敞">
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="130">
+ <template slot-scope="scope">
+ <span class="table_do">缂栬緫 </span>
+ <span class="table_do" @click="deleteRow(scope.$index, tableData)">鍒犻櫎</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ search: {
+ type: 0,
+ name: null
+ },
+ process: [],
+ tableData: [{
+ id: 1,
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ id: 2,
+ date: '2016-05-04',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
+ }, {
+ id: 3,
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
+ children: [{
+ id: 31,
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
+ children: [{
+ id: 33,
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
+ }, {
+ id: 34,
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
+ }]
+ }, {
+ id: 32,
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
+ }]
+ }, {
+ id: 4,
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
+ }],
+ selects: []
+ }
+ },
+ mounted() {
+ this.selectDataList()
+ },
+ methods: {
+ clean() {
+ this.search = {
+ type: null,
+ name: null
+ }
+ },
+ selectDataList(){
+ this.tableData.forEach(a=>{
+ a.ids = '01'
+ if(a.children!=undefined){
+ a.children.forEach(b=>{
+ b.ids = '02'
+ if(b.children!=undefined){
+ b.children.forEach(c=>{
+ c.ids = '03'
+ })
+ }
+ })
+ }
+ })
+ },
+ handleSelectionChange(val) {
+ this.selects = val;
+ },
+ del(ob) {
+ console.log(ob)
+ },
+ deleteRow(index, rows) {
+ console.log(index);
+ console.log(rows);
+ rows.splice(index, 1);
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/components/view/sale.vue b/src/components/view/sale.vue
index c229b1f..0df137d 100644
--- a/src/components/view/sale.vue
+++ b/src/components/view/sale.vue
@@ -115,9 +115,9 @@
<el-row>
<el-col :span="12" style="line-height: 32px;">閿�鍞鐞�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button type="primary" icon="el-icon-plus" @click="addDia= true">鏂板</el-button>
- <el-button icon="el-icon-edit-outline">淇敼</el-button>
- <el-button icon="el-icon-delete">鍒犻櫎</el-button>
+ <el-button type="primary" icon="el-icon-plus" @click="openAddDia">鏂板</el-button>
+ <!-- <el-button icon="el-icon-edit-outline">淇敼</el-button> -->
+ <el-button icon="el-icon-delete" @click="delSales">鍒犻櫎</el-button>
<el-button icon="el-icon-download">瀵煎嚭</el-button>
</el-col>
</el-row>
@@ -145,8 +145,9 @@
</el-button>
</div>
<div class="thing">
- <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
- max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" default-expand-all row-key="id">
+ <el-table ref="tableData" :data="tableData" border
+ style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)" max-height="calc(100% - 50px)"
+ @selection-change="handleSelectionChange" default-expand-all row-key="id">
<el-table-column type="selection" width="50">
</el-table-column>
<el-table-column type="index" label="搴忓彿" width="65">
@@ -171,16 +172,16 @@
<el-table-column label="鎿嶄綔" width="220">
<template slot-scope="scope">
<span class="table_do" @click="changeShowDetail(scope.row)"> 鏌ョ湅璇︽儏 </span>
- <span class="table_do" v-if="scope.row.type==null"> 瀹℃牳 </span>
+ <span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)"> 瀹℃牳 </span>
<span class="table_do" v-else> </span>
- <span class="table_do"> 缂栬緫 </span>
- <span class="table_do"> 鍒犻櫎 </span>
+ <span class="table_do" @click="openUpDia(scope.row.id)"> 缂栬緫 </span>
+ <span class="table_do" @click="delSale(scope.$index)"> 鍒犻櫎 </span>
</template>
</el-table-column>
</el-table>
<el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
- :page-sizes="[1,10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+ :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
:total="countSize">
</el-pagination>
</el-col>
@@ -208,7 +209,7 @@
<el-col :span="3" :offset="2">鐘舵��</el-col>
<el-col :span="8">
<div class="value" v-if="oneData.type == 1" style="color: #34BD66;">閫氳繃</div>
- <div class="value" v-else-if="oneData.type == 2" style="color: #E84738;">涓嶉�氳繃</div>
+ <div class="value" v-else-if="oneData.type == 0" style="color: #E84738;">涓嶉�氳繃</div>
<div class="value" v-else> </div>
</el-col>
</el-row>
@@ -238,7 +239,7 @@
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">涓氬姟鍛�</el-col>
<el-col :span="8">
- <div class="value">{{JSON.parse(oneData.saleman)}}</div>
+ <div class="value">{{oneData.saleman}}</div>
</el-col>
<el-col :span="3" :offset="2">涓嬪崟浜�</el-col>
<el-col :span="8">
@@ -252,13 +253,13 @@
</el-col>
<el-col :span="3" :offset="2">瀹℃牳浜�</el-col>
<el-col :span="8">
- <div class="value">{{JSON.parse(oneData.checkname)}}</div>
+ <div class="value">{{oneData.checkname==null?' ': oneData.checkname}}</div>
</el-col>
</el-row>
<el-row style="line-height: 30px;margin: 15px 0;">
<el-col :span="3">瀹℃牳鏃ユ湡</el-col>
<el-col :span="8">
- <div class="value">{{oneData.checkTime}}</div>
+ <div class="value">{{oneData.checkTime==null?' ': oneData.checkTime}}</div>
</el-col>
</el-row>
</div>
@@ -281,7 +282,7 @@
</el-dialog>
</div>
<div class="select-model">
- <el-dialog title="閿�鍞柊澧�" :visible.sync="addDia" width="750px">
+ <el-dialog :title="`閿�鍞�${upDia==true?'淇敼':'鏂板'}`" :visible.sync="addDia" width="800px">
<div class="body">
<div class="head">鍩烘湰淇℃伅</div>
<div class="content">
@@ -346,7 +347,8 @@
<el-table :data="addData.saleMaterialList" border style="width: 100%">
<el-table-column prop="name" label="浜у搧鍚嶇О" width="180">
<template slot-scope="scope">
- <el-input v-model="scope.row.name" size="small" clearable placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"></el-input>
+ <el-input v-model="scope.row.name" size="small" clearable placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�">
+ </el-input>
</template>
</el-table-column>
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" width="200">
@@ -362,7 +364,8 @@
<el-table-column prop="number" label="鏁伴噺">
<template slot-scope="scope">
<el-input v-model.number="scope.row.number" size="small"
- @change="scope.row.number = isNaN(scope.row.number)?0:scope.row.number" clearable placeholder="璇疯緭鍏�"></el-input>
+ @change="scope.row.number = isNaN(scope.row.number)?0:scope.row.number" clearable
+ placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
<el-table-column prop="price" label="鍗曚环">
@@ -370,11 +373,17 @@
<el-input v-model="scope.row.price" size="small" clearable placeholder="璇疯緭鍏�"></el-input>
</template>
</el-table-column>
+ <el-table-column prop="price" label="鎿嶄綔" width="65px">
+ <template slot-scope="scope">
+ <el-button type="text" @click.native.prevent="deleteRow(scope.$index, addData.saleMaterialList)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
</el-table>
</div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addSale">纭� 瀹�</el-button>
+ <el-button v-if="upDia==false" type="primary" @click="addSale">纭� 瀹�</el-button>
+ <el-button v-else-if="upDia==true" type="primary" @click="upSale">纭� 瀹�</el-button>
<el-button @click="addDia = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -399,10 +408,21 @@
pageSize: 10,
selectDia: false,
oneData: null,
- addDia: true,
+ addDia: false,
addData: {
+ orderNumber: null,
+ code: null,
+ name: null,
+ proname: null,
+ adress: null,
+ username: null,
+ delTime: null,
+ orderName: null,
+ phone: null,
saleMaterialList: []
- }
+ },
+ repeList: [],
+ upDia: false
}
},
mounted() {
@@ -410,7 +430,7 @@
},
methods: {
handleSelectionChange(val) {
- this.selects = val;
+ this.selects = val.id;
},
handleSizeChange(val) {
this.pageSize = val
@@ -462,12 +482,146 @@
this.addData.saleMaterialList.push({})
},
addSale() {
+ for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
+ if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
+ this.addData.saleMaterialList.splice(b, 1)
+ b--
+ } else {
+ for (var c in this.addData.saleMaterialList[b]) {
+ if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
+ .keys(this.addData.saleMaterialList[b]).length != 5) {
+ this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
+ return
+ }
+ }
+ }
+ }
+ for (var a in this.addData) {
+ if (this.addData[a] == null || this.addData[a] == '') {
+ if (a == 'saleMaterialList') {
+ this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
+ } else {
+ this.$message.error('閿�鍞鍗曟湁蹇呭～椤规湭濉啓')
+ }
+ return
+ }
+ }
this.axios.post(this.$api.url.addSale, this.addData, {
headers: {
'Content-Type': 'application/json'
}
}).then(res => {
- console.log(res);
+ this.$message.success('娣诲姞鎴愬姛')
+ this.addDia = false
+ this.selectRawInspectsList()
+ })
+ },
+ openAddDia() {
+ this.addDia = !(this.addDia)
+ this.upDia = false
+ },
+ upRepe(index, i) {
+ var data = this.repeList[index]
+ if (data == undefined) {
+ this.addData.saleMaterialList[i] = {}
+ } else {
+ this.addData.saleMaterialList[i].unit = data.unit
+ this.addData.saleMaterialList[i].specifications = data.specifications
+ }
+ },
+ saleCheck(ob) {
+ this.$confirm(`璁㈠崟${ob.row.code}鐨勪俊鎭槸鍚﹂�氳繃`, '閿�鍞鍗曞鏍�', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '閫氳繃',
+ cancelButtonText: '涓嶉�氳繃'
+ }).then(res => {
+ this.$axios.post(this.$api.url.saleCheck, {
+ id: ob.row.id,
+ type: 1
+ }).then(res => {
+ this.selectRawInspectsList()
+ })
+ }).catch(e => {
+ if (e == 'cancel') {
+ this.$axios.post(this.$api.url.saleCheck, {
+ id: ob.row.id,
+ type: 0
+ }).then(res => {
+ this.selectRawInspectsList()
+ })
+ }
+ })
+ },
+ openUpDia(index) {
+ this.addDia = true
+ this.upDia = true
+ this.axios.get(this.$api.url.selectSaleDatilById, {
+ params: {
+ id: index
+ }
+ }).then(res => {
+ this.addData = res.data
+ this.addData.id = index
+ })
+ },
+ upSale() {
+ console.log(this.addData);
+ for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
+ if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
+ this.addData.saleMaterialList.splice(b, 1)
+ b--
+ } else {
+ for (var c in this.addData.saleMaterialList[b]) {
+ if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
+ .keys(this.addData.saleMaterialList[b]).length != 6) {
+ this.$message.error('浜у搧淇℃伅鏈夊繀濉」鏈～鍐�')
+ return
+ }
+ }
+ }
+ }
+ for (var a in this.addData) {
+ if ((this.addData[a] == null || this.addData[a] == '') && a != 'type') {
+ if (a == 'saleMaterialList') {
+ this.$message.error('浜у搧淇℃伅涓嶈兘涓虹┖')
+ } else {
+ this.$message.error('閿�鍞鍗曟湁蹇呭～椤规湭濉啓')
+ }
+ return
+ }
+ }
+ this.axios.post(this.$api.url.updateSaleById, {
+ id: this.addData.id,
+ str: JSON.stringify(this.addData)
+ }).then(res => {
+ this.$message.success('缂栬緫鎴愬姛')
+ this.addDia = false
+ this.upDia = false
+ this.selectRawInspectsList()
+ })
+ },
+ deleteRow(index, rows) {
+ rows.splice(index, 1);
+ },
+ delSale(index){
+ this.axios.post(this.$api.url.delSale, {
+ id: this.tableData[index].id,
+ }).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.tableData.splice(index, 1)
+ })
+ },
+ delSales(){
+ console.log(this.selects);
+ this.axios.post(this.$api.url.delAllSale,{
+ ids: this.selects
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res=>{
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectRawInspectsList()
})
}
}
diff --git a/src/components/view/unqualifiedManagement.vue b/src/components/view/unqualifiedManagement.vue
index 921963c..ae53842 100644
--- a/src/components/view/unqualifiedManagement.vue
+++ b/src/components/view/unqualifiedManagement.vue
@@ -11,7 +11,9 @@
<script>
import Unqualified from './rawUnqualified/raw.vue'
+// import Unqualified from './rawUnqualified/Subqualified.vue'
+
export default {
components:{Unqualified}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/main.js b/src/main.js
index 3b771af..6cfc935 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,9 @@
import swal from 'sweetalert'
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80/"; //鍓嶇鏈湴绔彛
+Vue.prototype.HaveJson = (val) => {
+ return JSON.parse(JSON.stringify(val))
+}
Vue.use(VueAxios, axios)
Vue.config.productionTip = false
@@ -20,7 +23,7 @@
Vue.use(qs);
Vue.use(api);
-const javaApi = 'http://localhost:8001/'
+const javaApi = 'http://192.168.110.167:8001/'
axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
@@ -30,70 +33,70 @@
Vue.prototype.$axios = axios
import {
- Message
+ Message
} from 'element-ui';
axios.interceptors.request.use(function(config) {
- let tk = sessionStorage.getItem("token")
- let token;
- if (tk != undefined && tk != '') {
- token = tk
- }
- if (token) {
- config.headers['token'] = "" + token
- // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
- // config.headers['Content-Type'] = 'application/json'
- }
- // console.log(config)
- if (config.method === 'post' || config.method === 'put') {
-
- config.data = qs.stringify(config.data)
- }
- if(config.headers['Content-Type'] =='application/json'){
- config.data = qs.parse(config.data)
- // console.log(config.data)
- }
-
- return config
+ let tk = sessionStorage.getItem("token")
+ let token;
+ if (tk != undefined && tk != '') {
+ token = tk
+ }
+ if (token) {
+ config.headers['token'] = "" + token
+ // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+ // config.headers['Content-Type'] = 'application/json'
+ }
+ // console.log(config)
+ if (config.method === 'post' || config.method === 'put') {
+
+ config.data = qs.stringify(config.data)
+ }
+ if (config.headers['Content-Type'] == 'application/json') {
+ config.data = qs.parse(config.data)
+ // console.log(config.data)
+ }
+
+ return config
}, function(error) {
- return Promise.reject(error)
+ return Promise.reject(error)
})
axios.interceptors.response.use(res => {
- return res.data
+ return res.data
}, async function(err) {
- if (JSON.stringify(err).indexOf('timeout of') > -1) {
- Message.error('璇锋眰瓒呮椂锛岃妫�鏌ョ綉缁滆缃�')
- } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
- 'Network Error') > -1) {
- Message.error('缃戠粶杩炴帴閿欒')
- } else if (err.response.status == "503") {
- Message.error('鏈嶅姟鏈搷搴�')
- } else if (err.response.status == "404") {
- Message.error('璇锋眰澶辫触锛岄摼鎺ュ湴鍧�涓嶅瓨鍦�')
- } else if (err.response.status == "403") {
- Message.error('token涓嶅瓨鍦�')
- }else if (err.response.status == "402") {
- Message.error('鏃犳晥绛惧悕锛岃閲嶆柊鐧诲綍')
- localStorage.removeItem('autoenter')
- window.location.href = '/enter'
- } else if (err.response.status == "401") {
- await axios.post(javaApi + "user/refresh", {
- reToken: sessionStorage.getItem('reToken')
- }).then(res => {
- if (res.data.code==201) {
- Message.error('璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�')
- localStorage.removeItem('autoenter')
- window.location.href = '/enter'
- return Promise.reject(err)
- }
- sessionStorage.setItem('token', res.data.token)
- sessionStorage.setItem('reToken', res.data.reToken)
- })
- return axios(err.config)
- } else if (err.response.status == "500") {
- Message.error('鏈嶅姟绔嚭鐜伴敊璇�')
- }
- return Promise.reject(err)
+ if (JSON.stringify(err).indexOf('timeout of') > -1) {
+ Message.error('璇锋眰瓒呮椂锛岃妫�鏌ョ綉缁滆缃�')
+ } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
+ 'Network Error') > -1) {
+ Message.error('缃戠粶杩炴帴閿欒')
+ } else if (err.response.status == "503") {
+ Message.error('鏈嶅姟鏈搷搴�')
+ } else if (err.response.status == "404") {
+ Message.error('璇锋眰澶辫触锛岄摼鎺ュ湴鍧�涓嶅瓨鍦�')
+ } else if (err.response.status == "403") {
+ Message.error('token涓嶅瓨鍦�')
+ } else if (err.response.status == "402") {
+ Message.error('鏃犳晥绛惧悕锛岃閲嶆柊鐧诲綍')
+ localStorage.removeItem('autoenter')
+ window.location.href = '/enter'
+ } else if (err.response.status == "401") {
+ await axios.post(javaApi + "user/refresh", {
+ reToken: sessionStorage.getItem('reToken')
+ }).then(res => {
+ if (res.data.code == 201) {
+ Message.error('璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�')
+ localStorage.removeItem('autoenter')
+ window.location.href = '/enter'
+ return Promise.reject(err)
+ }
+ sessionStorage.setItem('token', res.data.token)
+ sessionStorage.setItem('reToken', res.data.reToken)
+ })
+ return axios(err.config)
+ } else if (err.response.status == "500") {
+ Message.error('鏈嶅姟绔嚭鐜伴敊璇�')
+ }
+ return Promise.reject(err)
})
// 璺敱鎷︽埅鍣�
@@ -111,7 +114,7 @@
// });
new Vue({
- el: '#app',
- router,
- render: h => h(App)
+ el: '#app',
+ router,
+ render: h => h(App)
});
diff --git a/src/router/index.js b/src/router/index.js
index abb623d..94b4fde 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -23,6 +23,5 @@
{
path: "/enter",
component: () => import("../view/enter.vue")
- },
- ]
-})
\ No newline at end of file
+ }]
+})
diff --git a/src/view/index.vue b/src/view/index.vue
index 3d5a9e8..9786b1c 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -67,7 +67,7 @@
color: #fff;
width: 68px;
height: 68px;
- margin: 20px 0;
+ margin: 8px 0;
cursor: pointer;
display: flex;
align-items: center;
@@ -319,6 +319,74 @@
}
]
},
+ {
+ k: 4,
+ v: "鐢熶骇绠＄悊",
+ i: "font icon-shouye",
+ c: [
+ {
+ k: 12,
+ v: "鐢熶骇璁㈠崟",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 13,
+ v: "鐢熶骇璁″垝",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 14,
+ v: "鐢熶骇鎶ュ伐",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 5,
+ v: "WMS绠＄悊",
+ i: "font icon-shouye",
+ c: [
+ {
+ k: 15,
+ v: "鍘熸潗鏂欏簱瀛�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 16,
+ v: "鍥炲崟绠＄悊",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 17,
+ v: "鍗婃垚鍝佸簱瀛�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 18,
+ v: "鎴愬搧搴撳瓨",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 19,
+ v: "鎴愬搧鍙戣揣",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 20,
+ v: "鎴愬搧鍏ュ簱",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
{
k: 1,
v: "鎶�鏈鐞�",
@@ -332,9 +400,9 @@
},
{
k: 2,
- v: "鎶�鏈枃浠�",
+ v: "璁㈠崟Bom",
i: "font icon-shouye",
- u: "technical"
+ u: "technicalaa"
}
]
},
@@ -390,9 +458,83 @@
v: "璁￠噺绠＄悊",
i: "font icon-shouye",
u: "measurementManagement"
+ },
+ {
+ k: 10.1,
+ v: "宸℃",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 10.2,
+ v: "涓嶅悎鏍煎搧澶勭疆",
+ i: "font icon-shouye",
+ u: "Processingproducts"
}
]
- }
+ },
+ {
+ k: 6,
+ v: "鏍哥畻绠＄悊",
+ i: "font icon-shouye",
+ c: [
+ {
+ k: 21,
+ v: "浜ч噺宸ヨ祫",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 22,
+ v: "鍛樺伐鍑哄嫟",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ },
+ {
+ k: 7,
+ v: "鍩虹鏁版嵁",
+ i: "font icon-shouye",
+ c: [
+ {
+ k: 23,
+ v: "宸ュ簭缁存姢",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 24,
+ v: "鑷缁存姢",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 25,
+ v: "鎶�鏈寚鏍囩淮鎶�",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 26,
+ v: "宸ヨ壓璺嚎缁存姢",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 27,
+ v: "璁惧缁存姢",
+ i: "font icon-shouye",
+ u: ""
+ },
+ {
+ k: 28,
+ v: "鐗╂枡娓呭崟缁存姢",
+ i: "font icon-shouye",
+ u: ""
+ }
+ ]
+ }
],
activeBox: 0,
activeP: 0,
@@ -445,11 +587,19 @@
this.activeBox = 0;
} else if (num > 0 && num <= 2) {
this.activeBox = 1;
- } else if (num > 2 && num <= 10) {
+ } else if (num > 2 && num < 11) {
this.activeBox = 2;
} else if (num == 11) {
this.activeBox = 3;
- }
+ } else if (num > 11 && num <=14){
+ this.activeBox = 4;
+ } else if (num>14 && num<=20){
+ this.activeBox = 5
+ } else if (num>20 && num<=22){
+ this.activeBox = 6
+ } else if (num>22 && num<=28){
+ this.activeBox = 7
+ }
},
out() {
sessionStorage.clear();
--
Gitblit v1.9.3