From a4b23bbf535f10c5ecc31b16bc8177bcfc23e996 Mon Sep 17 00:00:00 2001
From: hailin <1356886193@qq.com>
Date: 星期一, 07 八月 2023 09:44:13 +0800
Subject: [PATCH] 添加原材料检验单第一次
---
src/components/view/raw-ins.vue | 12
src/main.js | 10
src/components/view/rawInsBox.vue | 13
src/components/view/rawUnqualifiedBox.vue | 17 +
src/components/view/rawInsDetail.vue | 269 ++++++++++++++++++++------
src/components/view/rawUnqualified/raw.vue | 226 ++++++++++++++++++++++
src/components/view/unqualifiedManagement.vue | 17 +
src/view/index.vue | 4
src/assets/api/controller.js | 15 +
9 files changed, 500 insertions(+), 83 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 2e419b0..87c12b4 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -1,15 +1,22 @@
// 鎶�鏈鐞�-鏍囧噯Bom
const standard = {
selectTreeByMaterial: "material/selectTreeByMaterial", //鏌ヨ鐗╂枡鐨勬爲
- selectRawInspectsList: "rawInspect/selectRawInspectsList",//鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
selectProductByMaterial: "product/selectTreeByMaterial",//鏍规嵁鐗╂枡鏌ヨ椤圭洰琛ㄦ牸
selectTechnologyByMaterial: "technology/select"
}
-
+// 鍘熸潗鏂欐楠�
+const raw = {
+ selectRawInspectsList: "rawInspect/selectRawInspectsList",//鏌ヨ鍘熸潗鏂欐楠屽崟鍒楄〃
+ selectRawInspectsListById: "rawInspect/selectRawInspectsListById/",//鏍规嵁妫�楠屽崟id鑾峰彇妫�楠屽崟璇︽儏
+ updaterawInsProduct:'rawInsProduct/updaterawInsProduct',//淇敼椤圭洰鐨勬楠屽��
+ updateRawInspectsById:"/rawInspect/updateRawInspectsById/",//涓婃姤,
+ listMaterial:"/finished-inspect/list_material",//娣诲姞妫�楠屽崟鏃剁殑椤圭洰鍒楄〃
+}
const url = {
- "enter": "user/enter", //鐧诲綍
- ...standard
+ enter: "user/enter", //鐧诲綍
+ ...standard,
+ ...raw
}
diff --git a/src/components/view/raw-ins.vue b/src/components/view/raw-ins.vue
index 72c3841..1808269 100644
--- a/src/components/view/raw-ins.vue
+++ b/src/components/view/raw-ins.vue
@@ -80,7 +80,7 @@
<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 type="primary" icon="el-icon-plus" style="background: #004EA2;" @click="goDetail(null)">鏂板</el-button>
<el-button icon="el-icon-download">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -146,7 +146,7 @@
</el-table-column>
<el-table-column label="鎿嶄綔" width="100">
<template slot-scope="scope">
- <span class="table_do" @click="changeShowDetail">鏌ョ湅</span>
+ <span class="table_do" @click="changeShowDetail(scope.row)">鏌ョ湅</span>
<span class="table_do">鎵撳嵃</span>
</template>
</el-table-column>
@@ -220,8 +220,12 @@
},
this.selectRawInspectsList()
},
- changeShowDetail(){
- this.goDetail()
+ changeShowDetail({id}){
+ this.goDetail(id)
+ // console.log(id)
+ // const res = await this.$axios.post(this.$api.url.selectRawInspectsListById,{params:{id}})
+ // console.log(res)
+
}
}
}
diff --git a/src/components/view/rawInsBox.vue b/src/components/view/rawInsBox.vue
index 352e496..57710f5 100644
--- a/src/components/view/rawInsBox.vue
+++ b/src/components/view/rawInsBox.vue
@@ -5,8 +5,8 @@
<template>
<div class="rawInsBox">
- <RawIns v-show="!showDetail" :goDetail="goDetail"></RawIns>
- <RawInsDetail v-show="showDetail" :goBack="goBack" :detail="detail"></RawInsDetail>
+ <RawIns v-if="!showDetail" :goDetail="goDetail"></RawIns>
+ <RawInsDetail v-if="showDetail" :goBack="goBack" :detailId="id"></RawInsDetail>
</div>
</template>
@@ -18,13 +18,16 @@
data() {
return {
showDetail: false,
- detail:{}
+ id:0
}
},
+ mounted(){
+ },
methods:{
- goDetail(detail) {
+ goDetail(id) {
this.showDetail = true
- this.detail = detail
+ this.id = id
+ console.log(this.id)
},
goBack() {
this.showDetail = false
diff --git a/src/components/view/rawInsDetail.vue b/src/components/view/rawInsDetail.vue
index 716cab0..539c4f9 100644
--- a/src/components/view/rawInsDetail.vue
+++ b/src/components/view/rawInsDetail.vue
@@ -32,6 +32,9 @@
.raw-detail-info .el-input{
width: auto;
}
+ .raw-detail-info.raw-detail-info-edit >>>.el-input__inner{
+ background:#fff;
+ }
.raw-detail-info >>>.el-input__inner{
width: 224px;
height: 32px;
@@ -42,6 +45,12 @@
}
.raw-detail-info .el-form-item{
margin-bottom: 24px;
+ }
+ .raw-detail-info .el-form-item .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;
}
/* 妫�楠岄」鐩� */
@@ -70,56 +79,136 @@
</el-col>
</el-row>
</div>
- <div class="raw-detail-info">
- <el-form v-model="detail" label-position="right" label-width="120px" >
+ <div class="raw-detail-info" :class="detailId===null?'raw-detail-info-edit':''">
+ <el-form v-model="detailInfo" label-position="right" label-width="120px" >
<el-row>
<el-col :span="7">
<el-form-item label="鏉ユ枡鏃ユ湡:">
- <el-input></el-input>
+ <el-input v-if="detailId!==null" :disabled="detailId!==null" v-model="detailInfo.formTime"></el-input>
+ <el-date-picker
+ v-else
+ type="date"
+ v-model="detailInfo.formTime"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="瑙勬牸鍨嬪彿:">
- <el-input></el-input>
+ <el-input :disabled="detailId!==null" v-model="detailInfo.specifications"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鍘熸潗鏂欑紪鐮�:">
- <el-input></el-input>
+ <el-input :disabled="detailId!==null" v-model="detailInfo.code"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="鍘熸潗鏂欏悕绉�:">
- <el-input></el-input>
+ <el-input :disabled="detailId!==null" v-model="detailInfo.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="鎶ユ鏃ユ湡:">
- <el-input></el-input>
+ <el-form-item label="鏁伴噺:">
+ <el-input placeholder="璇疯緭鍏ユ楠屾暟閲�" :disabled="detailId!==null" v-model="detailInfo.number"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鍗曚綅:">
- <el-input></el-input>
+ <el-input placeholder="璇疯緭鍏ユ楠屽崟浣�" :disabled="detailId!==null" v-model="detailInfo.unit"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item v-show="detailId===null" label="" label-width="100px">
+ <el-button @click="addNewRawInspect">淇濆瓨鎻愪氦</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
+
<el-col :span="7">
- <el-form-item label="鏁伴噺:">
- <el-input></el-input>
+ <el-form-item v-show="detailId!==null" label="鎶ユ鏃ユ湡:">
+ <el-input :disabled="detailId!==null" v-model="detailInfo.createTime"></el-input>
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鎶ユ浜�:">
- <el-input></el-input>
+ <el-col :span="14">
+ <el-form-item v-show="detailId!==null" label="鎶ユ浜�:">
+ <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" >
+ <el-row>
+ <el-col :span="7">
+ <el-form-item label="璁㈠崟鍙�:">
+ <el-input placeholder="璇疯緭鍏ヨ鍗曞彿" v-model="rawInsParams.orderNumber"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="瀹㈡埛鍚嶇О:">
+ <el-input placeholder="璇疯緭鍏ュ鎴峰悕绉�" v-model="rawInsParams.customerName"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="宸ョ▼鍚嶇О:">
+ <el-input placeholder="璇疯緭鍏ュ伐绋嬪悕绉�" v-model="rawInsParams.projectName"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="7">
+ <el-form-item label="璐ㄩ噺杩芥函鍙�:">
+ <el-input placeholder="璇疯緭鍏ヨ川閲忚拷婧彿" v-model="rawInsParams.qualityTraceability"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="椤圭洰鍚嶇О:">
+ <el-select placeholder="璇疯緭鍏ラ」鐩悕绉�" v-model="rawInsParams.material">
+ <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="浜у搧缂栫爜:">
+ <el-input placeholder="浜у搧缂栫爜" disabled v-model="code"></el-input>
+ </el-form-item>
+ </el-col>
+
+ </el-row>
+ <el-row>
+ <el-col :span="7">
+ <el-form-item label="瑙勬牸鍨嬪彿:">
+ <el-input v-model="detailInfo.specificationsModel"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鍗曚綅:">
+ <el-input placeholder="璇疯緭鍏ュ崟浣�" v-model="rawInsParams.unit"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鏁伴噺">
+ <el-input placeholder="璇疯緭鍏ヤ骇鍝佺紪鐮�" v-model="rawInsParams.qualityTraceability"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="21">
+ <el-form-item label="涓绘満宸�:">
+ <el-input placeholder="璇疯緭鍏ヤ富鏈哄伐" v-model="rawInsParams.userId"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="3">
+ <el-form-item label="" label-width="100px">
+ <el-button @click="addNewRawInspect">淇濆瓨鎻愪氦</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form> -->
</div>
<div class="title">
<el-row>
@@ -144,36 +233,43 @@
width="212">
</el-table-column>
<el-table-column
- prop="address"
+ prop="unit"
label="鍗曚綅"
width="148">
</el-table-column>
<el-table-column
- prop="address"
+ prop="required"
label="鏍囧噯"
width="254">
</el-table-column>
<el-table-column
- prop="address"
+ prop="internal"
label="鍐呮帶鍊�"
width="291">
</el-table-column>
<el-table-column
- prop="address"
+ prop="testValue"
label="妫�鏌ュ��"
width="371">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.testValue" @blur="changeState(scope.row)"></el-input>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ prop="deviceName"
label="璇曢獙璁惧"
width="248"
>
</el-table-column>
<el-table-column
- prop="address"
+ prop="testState"
label="缁撹"
width="98"
>
+ <template slot-scope="scope">
+ <span v-show="scope.row.testState!=null" :style="{color: scope.row.testState===1?'#67C23A':'#F56C6C'}">{{scope.row.testState===1?'鍚堟牸':'涓嶅悎鏍�'}}</span>
+ <span v-show="scope.row.testState==null">鏆傛湭缁撹</span>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -185,31 +281,37 @@
<div class="raw-conclusion-table">
<el-table :data="conclusionTable">
<el-table-column
- prop="number"
+ prop="code"
label="鐗╂枡缂栧彿"
width="353">
</el-table-column>
<el-table-column
- prop="number"
+ prop="name"
label="鐗╂枡鍚嶇О"
width="353">
</el-table-column>
<el-table-column
- prop="number"
+ prop="names"
label="妫�楠屽憳"
width="542">
+ <template slot-scope="scope">
+ <span v-for="item in scope.row.names" :key="item.username" :style="{marginRight:'8px'}">{{item}}</span>
+ </template>
</el-table-column>
<el-table-column
- prop="number"
+ prop="testState"
label="妫�楠岀粨璁�"
width="362">
+ <template slot-scope="scope">
+ <span v-show="scope.row.testState!=null" :style="{color: scope.row.testState===1?'#67C23A':'#F56C6C'}">{{scope.row.testState===1?'鍚堟牸':'涓嶅悎鏍�'}}</span>
+ <span v-show="scope.row.testState==null">鏆傛湭缁撹</span>
+ </template>
</el-table-column>
<el-table-column
- fixed="right"
label="鎿嶄綔"
width="120">
- <template slot-scope="scope">
- <el-button type="text" size="small">涓婃姤</el-button>
+ <template>
+ <el-button type="text" size="small" @click.once="submitSave">涓婃姤</el-button>
</template>
</el-table-column>
</el-table>
@@ -221,51 +323,84 @@
import RawIns from './raw-ins.vue'
export default {
components:{RawIns},
- props:['goBack','detail'],
+ props:['goBack','detailId'],
created(){
- console.log(this.detail)
+ // 娓呯┖
+ this.detailInfo = {}
+ if(this.detailId){
+ console.log(this.detailId)
+ this.getDetailInfo()
+ }else{
+ this.getOptions()
+ }
+ },
+ mounted(){
+ },
+ computed:{
+ conclusionTable(){
+ // console.log(this.projectTable)
+ // console.log(this.projectTable.map(item=>item.userName))
+ const conclusion = {}
+ conclusion.name = this.detailInfo.name
+ conclusion.code = this.detailInfo.code
+ conclusion.names= [...new Set(this.projectTable.map(item=>item.userName))]
+ console.log(this.projectTable.filter(item=>item.testState===0))
+ if(this.projectTable.filter(item=>item.testState===null).length){
+ conclusion.testState = null
+ return [conclusion]
+ }
+ if(this.projectTable.filter(item=>item.testState===0).length>0){
+ conclusion.testState= 0
+ }else{
+ conclusion.testState= 1
+ }
+ return [conclusion]
+ },
+ // 浜у搧缂栫爜
+ // code(){
+ // const material= this.materialOptions.filter(item=>item.name===this.rawInsParams.material)[0]
+ // return material && material.code
+ // }
},
data() {
return {
- conclusionTable:[
- {number:'鐗╂枡鍚嶇О'}
- ],
- projectTable:[
- {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯�'
- }
- ]
+ // 璇︽儏椤靛氨鏄鎯呬俊鎭�
+ detailInfo:{},
+ projectTable:[],
+ // 鏂板缓妫�楠屽崟鍙傛暟瀵硅薄
+ rawInsParams:{},
+ // 椤圭洰鍚嶇Оoptions
+ materialOptions:[]
}
},
+ methods:{
+ // 鑾峰彇鎶ユ鍗曡鎯呬俊鎭�
+ async getDetailInfo() {
+ const {data} = await this.$axios.get(this.$api.url.selectRawInspectsListById+`${this.detailId}`,{params:{id:this.detailId}})
+ this.detailInfo = data
+ this.projectTable = data.rawInsProducts
+ // console.log(this.projectTable)
+ },
+ // 鏂板妫�楠屽崟
+ addNewRawInspect() {
+ console.log(this.detailInfo)
+ },
+ // 淇敼椤圭洰鐨勬娴嬪�兼敼鍙樼粨璁�
+ async changeState(row){
+ // console.log(row)
+ const res = await this.$axios.post(this.$api.url.updaterawInsProduct,{...row},{headers:{'Content-Type':'application/json'}})
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.getDetailInfo()//閲嶆柊鍒锋柊淇℃伅鏁版嵁
+ },
+ async submitSave() {
+ const res = await this.$axios.post(this.$api.url.updateRawInspectsById+`${this.detailId}`)
+ this.$message.success('鎻愪氦鎴愬姛')
+ this.getDetailInfo()
+ },
+ async getOptions() {
+ const {data} = await this.$axios.get(this.$api.url.listMaterial)
+ this.materialOptions = data
+ }
+ }
}
</script>
diff --git a/src/components/view/rawUnqualified/raw.vue b/src/components/view/rawUnqualified/raw.vue
new file mode 100644
index 0000000..afe2122
--- /dev/null
+++ b/src/components/view/rawUnqualified/raw.vue
@@ -0,0 +1,226 @@
+<style scoped>
+.unqualifiedBox{
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+}
+ .unqualifiedBox .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;
+ }
+ .unqualifiedBox .title {
+ margin-bottom: 10px;
+ padding: 0 20px;
+ }
+/* 鏉′欢鏌ヨ澶撮儴鏍峰紡 */
+ .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;
+ }
+ /* 涓嶅悎鏍艰〃鏍兼牱寮� */
+ .unqualifiedTable{
+ flex: 1;
+ background: #fff;
+ margin-top: 11px;
+ padding: 23px 21px;
+ }
+</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>
+ <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>
+ <div class="unqualifiedTable">
+ <el-table :data="unqualifiedData" height="630">
+ <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>
+</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
+ }
+ },
+}
+</script>
\ No newline at end of file
diff --git a/src/components/view/rawUnqualifiedBox.vue b/src/components/view/rawUnqualifiedBox.vue
new file mode 100644
index 0000000..921963c
--- /dev/null
+++ b/src/components/view/rawUnqualifiedBox.vue
@@ -0,0 +1,17 @@
+<style scoped>
+
+</style>
+
+
+<template>
+ <div class="rawUnqualifiedBox">
+ <Unqualified></Unqualified>
+ </div>
+</template>
+
+<script>
+import Unqualified from './rawUnqualified/raw.vue'
+export default {
+ components:{Unqualified}
+}
+</script>
\ No newline at end of file
diff --git a/src/components/view/unqualifiedManagement.vue b/src/components/view/unqualifiedManagement.vue
new file mode 100644
index 0000000..921963c
--- /dev/null
+++ b/src/components/view/unqualifiedManagement.vue
@@ -0,0 +1,17 @@
+<style scoped>
+
+</style>
+
+
+<template>
+ <div class="rawUnqualifiedBox">
+ <Unqualified></Unqualified>
+ </div>
+</template>
+
+<script>
+import Unqualified from './rawUnqualified/raw.vue'
+export default {
+ components:{Unqualified}
+}
+</script>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 5724f71..5421a27 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,11 +40,19 @@
}
if (token) {
config.headers['token'] = "" + token
- config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
+ // 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)
diff --git a/src/view/index.vue b/src/view/index.vue
index a4ec2a4..f6e7402 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -297,7 +297,7 @@
k: 4,
v: "鍘熸潗鏂欎笉鍚堟牸鍝�",
i: "font icon-shouye",
- u: ""
+ u: "rawUnqualifiedBox"
}, {
k: 5,
v: "杩囩▼妫�楠�",
@@ -312,7 +312,7 @@
k: 7,
v: "涓嶅悎鏍煎搧绠＄悊",
i: "font icon-shouye",
- u: ""
+ u: "unqualifiedManagement"
}, {
k: 8,
v: "瀹為獙瀹ょ鐞�",
--
Gitblit v1.9.3