From 63a5da9d6be10bbd910812c423bdfad7ae2945e5 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 09 四月 2024 11:24:16 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/silk/silk-web into zzq
---
src/views/productManage/silkRegisterForm/addPage.vue | 679 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 401 insertions(+), 278 deletions(-)
diff --git a/src/views/productManage/silkRegisterForm/addPage.vue b/src/views/productManage/silkRegisterForm/addPage.vue
index 62f66a8..d227d14 100644
--- a/src/views/productManage/silkRegisterForm/addPage.vue
+++ b/src/views/productManage/silkRegisterForm/addPage.vue
@@ -3,7 +3,7 @@
<div class="tab-view">
<el-tabs v-model="activeName" @tab-click="tabsClick">
<el-tab-pane label="绾ゅ害鐧昏琛�" name="first"></el-tab-pane>
- <el-tab-pane label="绾ゅ害妫�楠岃〃" name="second"></el-tab-pane>
+ <el-tab-pane label="绾ゅ害妫�楠岃〃" :disabled='!registerId&&!isRegisterSave' name="second"></el-tab-pane>
</el-tabs>
</div>
<template v-if="activeName == 'first'">
@@ -13,7 +13,8 @@
placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
<template slot="leftButton">
<el-button size="small" type="primary" @click="cancelClickOne">鏀惧純</el-button>
- <el-button size="small" type="primary" @click="saveClickOne('form')">淇濆瓨</el-button>
+ <el-button size="small" type="primary" :loading="isAddloading"
+ @click="saveClickOne('form')">淇濆瓨</el-button>
</template>
</CommonSearch>
</div>
@@ -47,13 +48,13 @@
</el-select>
</el-form-item>
<el-form-item label="瑙勬牸" prop="spec" class="form-item">
- <el-input v-model="form.spec" placeholder="璇疯緭鍏�">
- </el-input>
- <!-- <el-select v-model="form.spec" placeholder="璇烽�夋嫨" class="select-width">
- <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name"
- :value="item.id">
+ <el-select v-model="form.spec" placeholder="璇烽�夋嫨" class="select-width">
+ <el-option v-for="item in specList" :key="item.ID" :label="item.name"
+ :value="item.name">
</el-option>
- </el-select> -->
+ </el-select>
+ <!-- <el-input v-model="form.spec" placeholder="璇疯緭鍏�">
+ </el-input> -->
</el-form-item>
<el-form-item label="缁勫埆" prop="workshopGroup" class="form-item">
<el-select v-model="form.workshopGroup" placeholder="璇烽�夋嫨" class="select-width">
@@ -61,21 +62,23 @@
:value="item.ID">
</el-option>
</el-select>
+
</el-form-item>
<el-form-item label="鍥炴暟" prop='circle' class="form-item">
<el-row>
<el-col :span="11">
- <el-form-item label="" @input="inputStart" label-width="0" prop="startCircle" class="select-width">
- <el-input v-model.number="form.startCircle" placeholder="璇疯緭鍏�" show-word-limit
- class="select-width"></el-input>
+ <el-form-item label="" @input="inputStart" label-width="0" prop="startCircle"
+ class="select-width">
+ <el-input v-model.number="form.startCircle" placeholder="璇疯緭鍏�" show-word-limit
+ class="select-width"></el-input>
</el-form-item>
</el-col>
<el-col :span="2" style="margin:0 auto;text-align:center;">-</el-col>
<el-col :span="11">
<el-form-item label="" label-width="0" prop="endCircle" class="select-width">
- <el-input v-model.number="form.endCircle" @input="inputStart" placeholder="璇疯緭鍏�" show-word-limit
- class="select-width"></el-input>
+ <el-input v-model.number="form.endCircle" @input="inputStart" placeholder="璇疯緭鍏�"
+ show-word-limit class="select-width"></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -86,9 +89,14 @@
</el-form-item>
</el-form>
<div class="list-view">
- <TableCommonView ref="tableListRef" :colOpenShow="false" v-loading="loading" :table-list="tableList"
+ <!-- <TableCommonView ref="tableListRef" :colOpenShow="false" v-loading="loading" :table-list="tableList"
@selTableCol="selTableCol">
- </TableCommonView>
+ </TableCommonView> -->
+ <!-- 淇敼涓鸿緭鍏� -->
+ <CommonFormTableView ref="commonFormTableView" :detail-enter="isView ? true : false"
+ :selectBox="false" :detailEnter="true" :show-summary="showSummary"
+ :product-table-list="tableList" @inputContent="inputContent"
+ @addProductClick="addProductClick"></CommonFormTableView>
</div>
</div>
<div class="body-r">
@@ -98,47 +106,48 @@
</div>
</template>
<template v-if="activeName == 'second'">
- <!-- <div class="body-two body" v-if="activeName == 'second'">
+ <div class="filter">
+ <div class="filter-card">
+ <!-- <CommonSearch :show-add="false" :show-download="false" :amount-view="false" :show-action-btn="false"
+ placeholder="璇疯緭鍏ュ叧閿瘝" @searchClick="onFilterSearch">
+ <template slot="leftButton"> -->
+ <el-button size="small" type="primary" @click="cancelClickTwo">鏀惧純</el-button>
+ <el-button size="small" type="primary" :loading="isAddloading"
+ @click="saveClickOne('form')">淇濆瓨</el-button>
+ <!-- </template>
+</CommonSearch> -->
+ </div>
+ </div>
+ <div class="body-two body">
<div class="body-two-t">绾ゅ害妫�楠岃〃</div>
- <el-form ref="form" class="form-box" :model="form" :rules="rules" label-position="right" label-width="60px">
+ <el-form ref="form" class="form-box" :model="form" :rules="rules" label-position="right"
+ label-width="60px">
<div class="form-box-t">
- <el-form-item label="缂栧彿" prop="clientName" class="form-item">
- 1234546677
+ <el-form-item label="缂栧彿" prop="number" class="form-item">
+ {{ form.number }}
</el-form-item>
- <el-form-item label="杞﹂棿" prop="deliverType" class="form-item">
- <el-select v-model="form.deliverType" placeholder="璇烽�夋嫨">
- <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <el-form-item label="杞﹂棿" prop="name" class="form-item">
+ {{ form.name }}
</el-form-item>
- <el-form-item label="缁勫埆" prop="deliverType" class="form-item">
- <el-select v-model="form.deliverType" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
+ <el-form-item label="缁勫埆" prop="workshopGroup" class="form-item">
+ {{ form.workshopGroup }}
</el-form-item>
- <el-form-item label="鍥炴暟" prop="amount" class="form-item">
- <el-input v-model.number="form.amount" placeholder="璇疯緭鍏�" show-word-limit
- style="width: 100%"></el-input>
+ <el-form-item label="鍥炴暟" prop="circle" class="form-item">
+ {{ form.circle }}
</el-form-item>
- <el-form-item label="瑙勬牸" prop="clientName" class="form-item">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
- </el-input>
+ <el-form-item label="瑙勬牸" prop="spec" class="form-item">
+ {{ form.spec }}
</el-form-item>
- <el-form-item label="鏃ユ湡" prop="signTime" class="form-item">
- <el-date-picker v-model="form.signTime" value-format="yyyy-MM-dd" type="date" placeholder="閫夋嫨鏃ユ湡"
- style="width:100%">
- </el-date-picker>
+ <el-form-item label="鏃ユ湡" prop="finishDate" class="form-item">
+ {{ form.finishDate }}
</el-form-item>
</div>
<div class="list-view">
<el-table ref="multipleTable" :data="tableTwoList.tableInfomation" tooltip-effect="dark"
style="width: 100%">
- <el-table-column label="杞﹀彿" prop="templateName" width="100">
+ <el-table-column label="杞﹀彿" prop="ID" width="100">
</el-table-column>
- <el-table-column label="涓嬪樊绾ゅ害" prop="name" width="100" align="center">
+ <el-table-column label="涓嬪樊绾ゅ害" prop="name1" width="100" align="center">
<template v-for="(item, i) in tableTwoList.lower">
<el-table-column align="center" :key="i" :prop="item.prop" :label="item.label"
:width="item.width" :min-width="item.min" show-overflow-tooltip
@@ -146,7 +155,7 @@
</el-table-column>
</template>
</el-table-column>
- <el-table-column label="鐩殑绾ゅ害" prop="name" width="100" align="center">
+ <el-table-column label="鐩殑绾ゅ害" prop="name2" width="100" align="center">
<template v-for="(item, i) in tableTwoList.objective">
<el-table-column align="center" :key="i" :prop="item.prop" :label="item.label"
:width="item.width" :min-width="item.min" show-overflow-tooltip
@@ -154,7 +163,7 @@
</el-table-column>
</template>
</el-table-column>
- <el-table-column label="涓婂樊绾ゅ害" prop="name" width="100" align="center">
+ <el-table-column label="涓婂樊绾ゅ害" prop="name3" width="100" align="center">
<template v-for="(item, i) in tableTwoList.upper">
<el-table-column align="center" :key="i" :prop="item.prop" :label="item.label"
:width="item.width" :min-width="item.min" show-overflow-tooltip
@@ -162,9 +171,9 @@
</el-table-column>
</template>
</el-table-column>
- <el-table-column prop="valueRange" label="鍋忓樊" width="120">
+ <el-table-column prop="deviation" label="鍋忓樊" width="120">
</el-table-column>
- <el-table-column prop="unit" label="鎬诲樊" show-overflow-tooltip>
+ <el-table-column prop="totalDeviation" label="鎬诲樊" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="valueRange" label="閲庣氦" width="120">
</el-table-column>
@@ -172,102 +181,88 @@
</el-table-column>
<el-table-column prop="valueRange" label="鐗归噹" width="120">
</el-table-column>
- <el-table-column prop="unit" label="绛夌骇" show-overflow-tooltip>
+ <el-table-column prop="finenessGrade" label="绛夌骇" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="valueRange" label="II搴�" width="120">
+ <el-table-column prop="twiceChange" label="II搴�" width="120">
</el-table-column>
- <el-table-column prop="unit" label="娓呮磥" show-overflow-tooltip>
+ <el-table-column prop="cleanliness" label="娓呮磥" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="valueRange" label="娲佸噣" width="120">
+ <el-table-column prop="purity" label="娲佸噣" width="120">
</el-table-column>
- <el-table-column prop="unit" label="澶囨敞" show-overflow-tooltip>
+ <el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip>
</el-table-column>
</el-table>
</div>
<div class="form-box-b">
- <el-form-item label="骞冲潎绾ゅ害" prop="clientName" class="form-item-two" label-width="100px">
- 1234546677
+ <el-form-item label="骞冲潎绾ゅ害" prop="averageFineness" class="form-item-two" label-width="100px">
+ {{ form.averageFineness }}
</el-form-item>
- <el-form-item label="鍏噺绾ゅ害" prop="deliverType" class="form-item" label-width="100px">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
+ <el-form-item label="鍏噺绾ゅ害" prop="measureFineness" class="form-item" label-width="100px">
+ <el-input v-model="form.measureFineness" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
- <el-form-item label="鍋忓樊" prop="clientName" class="form-item-two">
- 0.98
+ <el-form-item label="鍋忓樊" prop="deviation" class="form-item-two">
+ {{ form.deviation }}
</el-form-item>
- <el-form-item label="鎬诲樊" prop="clientName" class="form-item-two">
- 0.98
+ <el-form-item label="鎬诲樊" prop="totalDeviation" class="form-item-two">
+ {{ form.totalDeviation }}
</el-form-item>
- <el-form-item label="杞︾粍绛夌骇" prop="deliverType" class="form-item-two" label-width="100px">
- 4A
+ <el-form-item label="杞︾粍绛夌骇" prop="finenessGrade" class="form-item-two" label-width="100px">
+ {{ form.finenessGrade }}
</el-form-item>
- <el-form-item label="II搴�" prop="amount" class="form-item">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
+ <el-form-item label="II搴�" prop="twiceChange" class="form-item">
+ <el-input v-model="form.twiceChange" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
- <el-form-item label="娓呮磥" prop="clientName" class="form-item">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
+ <el-form-item label="娓呮磥" prop="cleanliness" class="form-item">
+ <el-input v-model="form.cleanliness" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
- <el-form-item label="娲佸噣" prop="signTime" class="form-item">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
+ <el-form-item label="娲佸噣" prop="purity" class="form-item">
+ <el-input v-model="form.purity" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
- <el-form-item label="搴勫彛宸ヨ壓鍗曠紪鍙�" prop="signTime" class="form-item" label-width="110px">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
+ <el-form-item label="搴勫彛宸ヨ壓鍗曠紪鍙�" prop="marketProcessOrderNumber" class="form-item"
+ label-width="110px">
+ <el-input v-model="form.marketProcessOrderNumber" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
- <el-form-item label="妫�楠屽憳" prop="signTime" class="form-item">
- <el-input v-model="form.clientName" placeholder="璇疯緭鍏�">
+ <el-form-item label="妫�楠屽憳" prop="inspector" class="form-item">
+ <el-input v-model="form.inspector" placeholder="璇疯緭鍏�">
</el-input>
</el-form-item>
</div>
</el-form>
- </div> -->
+ </div>
</template>
</div>
</template>
-
+
<script>
-import { getRegisterList,saveRegister,getDictList } from "@/api/productManage/silkRegisterForm.js"
+import { saveRegister, getDictList, getWorkshopManageList, getRegisterDetails } from "@/api/productManage/silkRegisterForm.js"
+import { getCheckDetails, saveCheck, } from "@/api/productManage/silkInspectForm.js"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import CommonFormTableView from "@/components/makepager/CommonFormTableView"
export default {
name: "silkRegisterAddPage",
props: {},
mixins: [pageMixin],
components: {
+ CommonFormTableView,
},
computed: {},
data() {
return {
- tableList: {},
loading: false,
activeName: "first",
searchOptions: [],
- search_map: {},
- is_public: true,
- tableColumn: [
- { label: "杞﹀彿", prop: "position", min: 100, default: true }, // 瀹㈡埛鍚嶇О
- { label: "绾ゅ害鍊�", prop: "fineness", default: true }, // 閿�鍞礋璐ｄ汉
- { label: "鏁伴噺", prop: "quantity", default: true }, // 閲嶈绾у埆
- { label: "绾ゅ害鍚堣", prop: "sum", min: 90, default: true }, // 涓嬫鍥炶鏃ユ湡
- ],
- showCol: ['杞﹀彿', '绾ゅ害鍊�', '鏁伴噺', '绾ゅ害鍚堣'],
- marketList:[], //搴勫彛
- nameList:[], //杞﹂棿
- workshopGroupList:[], //缁勫埆
+ keyword: '',
+ marketList: [], //搴勫彛
+ nameList: [], //杞﹂棿
+ workshopGroupList: [], //缁勫埆
deliveryTypeList: [],
+ specList: [], //瑙勬牸
form: {
- number:'',
- finishDate:'',
- market:'',
- name:'',
- spec:'',
- workshopGroup:'',
- circle:'',
- startCircle:'',
- endCircle:'',
- position:'',
},
rules: {
number: [
@@ -276,14 +271,16 @@
finishDate: [
{ required: true, message: "璇烽�夋嫨", trigger: ["change", 'blur'] },
],
+ // 杞﹂棿 搴旇true
name: [
{ required: true, message: "璇烽�夋嫨", trigger: ["change", 'blur'] },
],
spec: [
{ required: true, message: "璇峰～鍐�", trigger: ["change", 'blur'] },
],
+ // 缁勫埆 搴旇true
workshopGroup: [
- { required: true, message: "璇烽�夋嫨", trigger: ["change", 'blur'] },
+ { required: false, message: "璇烽�夋嫨", trigger: ["change", 'blur'] },
],
circle: [
{ required: true, message: "璇峰～鍐�", trigger: ["change", 'blur'] },
@@ -300,199 +297,280 @@
},
tableTwoList: {
tableInfomation: [],
- lower: [
- { label: "14", prop: "name", min: 100, default: true },
- { label: "14.5", prop: "member_name", default: true },
- { label: "15", prop: "client_level", default: true },
- { label: "15.5", prop: "next_visit_time", min: 90, default: true },
- { label: "16", prop: "name", min: 100, default: true },
- { label: "16.5", prop: "member_name", default: true },
- { label: "17", prop: "client_level", default: true },
- { label: "17.5", prop: "next_visit_time", min: 90, default: true },
- { label: "18", prop: "client_level", default: true },
- { label: "18.5", prop: "next_visit_time", min: 90, default: true },
+ lower: [],
+ objective: [],
+ upper: [],
+ },
+ // 鏂板绾ゅ害鐧昏琛�
+ isAddloading: false,
+ isView: true,
+ showSummary: {
+ show: true,
+ total: true,
+ totalLabel: '鍚堣:',
+ sumProp: ["fineness", "quantity", 'sum'],
+ mergeNumber: 0
+ },
+ productId: 1,
+ tableList: {
+ allcol: [],
+ headerColor: 'red',
+ showcol: ['杞﹀彿', '绾ゅ害鍊�', '鏁伴噺', '绾ゅ害鍚堣'],
+ tableData: [
+ {
+ productId: 1,
+ position: null,
+ fineness: null,
+ quantity: null,
+ sum: null,
+ }
],
- objective: [
- { label: "19", prop: "name", min: 100, default: true },
- { label: "19.5", prop: "member_name", default: true },
- { label: "20", prop: "client_level", default: true },
- { label: "20.5", prop: "next_visit_time", min: 90, default: true },
- { label: "21", prop: "name", min: 100, default: true },
- ],
- upper: [
- { label: "21.5", prop: "name", min: 100, default: true },
- { label: "22", prop: "member_name", default: true },
- { label: "22.5", prop: "next_visit_time", min: 90, default: true },
- { label: "23", prop: "name", min: 100, default: true },
- { label: "23.5", prop: "member_name", default: true },
- { label: "24", prop: "client_level", default: true },
- { label: "24.5", prop: "next_visit_time", min: 90, default: true },
- { label: "25", prop: "client_level", default: true },
- { label: "25.5", prop: "next_visit_time", min: 90, default: true },
- { label: "26", prop: "client_level", default: true },
- { label: "26.5", prop: "next_visit_time", min: 90, default: true },
+ tableColumn: [
+ { label: "杞﹀彿", prop: "position", inputNumber: true, isRequird: true, }, // 瀹㈡埛鍚嶇О
+ { label: "绾ゅ害鍊�", prop: "fineness", inputNumber: true, isRequird: true, }, // 閿�鍞礋璐ｄ汉
+ { label: "鏁伴噺", prop: "quantity", inputNumber: true, isRequird: true, }, // 閲嶈绾у埆
+ { label: "绾ゅ害鍚堣", prop: "sum", inputNumber: true, isRequird: true, }, // 涓嬫鍥炶鏃ユ湡
],
},
+ tableData: [],
+ registerId: '',
+ inspectID: '',
+ isRegisterSave:false,
}
},
created() {
let query = this.$route.query;
if (query) {
this.activeName = query.activeName ? query.activeName : "first";
+ this.registerId = query.id ? query.id : "";
+ this.inspectID = query.inspectID ? query.inspectID : "";
}
- this.setTable()
this.getSelectDataList()
- this.search_map = {
- is_public: this.is_public
- }
- this.getData()
+ this.keyword = ''
+ this.getDetailsData()
},
methods: {
- getSelectDataList(){
+ getDetailsData(id) {
+ if (this.activeName == 'first') {
+ this.form = {
+ number: '',
+ finishDate: '',
+ market: '',
+ name: '',
+ spec: '',
+ workshopGroup: '',
+ circle: '',
+ startCircle: '',
+ endCircle: '',
+ position: '',
+ }
+ if (this.registerId) {
+ getRegisterDetails({ id: id ? id : this.registerId }).then((response) => {
+ if (response.code === 200) {
+ let config = JSON.parse(JSON.stringify(response.data ? response.data : {}));
+ this.form = config;
+ this.tableList.tableData = config.finenessList ? config.finenessList : []
+ }
+ })
+ }
+ } else {
+ this.form = {
+ number: '',
+ name: '',
+ workshopGroup: '',
+ circle: '',
+ spec: '',
+ finishDate: '',
+ averageFineness: '',
+ measureFineness: '',
+ deviation: '',
+ totalDeviation: '',
+ finenessGrade: '',
+ twiceChange: '',
+ cleanliness: '',
+ purity: '',
+ marketProcessOrderNumber: '',
+ inspector: '',
+ }
+ if (this.inspectID) {
+ getCheckDetails({ id: id ? id : this.inspectID }).then((response) => {
+ if (response.code === 200) {
+ let config = JSON.parse(JSON.stringify(response.data.info ? response.data.info : {}));
+ this.form = config;
+ this.form.number = config.finenessRegister.number
+ this.form.name = config.finenessRegister.name
+ this.form.workshopGroup = config.finenessRegister.workshopGroup
+ this.form.spec = config.finenessRegister.spec
+ this.form.finishDate = config.finenessRegister.finishDate
+ this.form.circle = config.finenessRegister.circle
+ this.getTableHeader()
+ this.tableTwoList.tableInfomation = response.data.items ? response.data.items : []
+ }
+ })
+ }
+ }
+ },
+ getTableHeader(){
+ let lowNumber;
+ let topNumber;
+ if(this.form.spec){
+ lowNumber=Number(this.form.spec.split('/')[0])
+ topNumber=Number(this.form.spec.split('/')[1])
+ }
+ this.tableTwoList.objective=[]
+ this.tableTwoList.lower=[]
+ this.tableTwoList.upper=[]
+ if(lowNumber&&topNumber){
+ for(let i = 0; i <lowNumber; i++){
+ let item={
+ label: lowNumber+i*0.5+'',
+ prop: lowNumber+i*0.5+'',
+ min: 100,
+ default: true
+ }
+ this.tableTwoList.objective.push(item)
+ if(lowNumber+i*0.5==topNumber){
+ break;
+ }
+ }
+ let lowStart=lowNumber-5
+ for(let i = 0; i <lowStart; i++){
+ let item={
+ label: lowStart+i*0.5+'',
+ prop: lowStart+i*0.5+'',
+ min: 100,
+ default: true
+ }
+ this.tableTwoList.lower.push(item)
+ if(lowStart+i*0.5==(lowNumber-0.5)){
+ break;
+ }
+ }
+ let topEnd=topNumber+5
+ for(let i = 1; i <topNumber; i++){
+ let item={
+ label: topNumber+i*0.5+'',
+ prop: topNumber+i*0.5+'',
+ min: 100,
+ default: true
+ }
+ this.tableTwoList.upper.push(item)
+ if(topNumber+i*0.5==topEnd){
+ break;
+ }
+ }
+ }
+ this.$forceUpdate()
+ },
+ getSelectDataList() {
//杞﹂棿
- getDictList({
- dictType: 0,
- }).then((res) => {
- if (res.code == 200) {
- this.nameList=res.data||[]
- }
- })
- //缁勫埆
getDictList({
dictType: 1,
}).then((res) => {
- if (res.code == 200) {
- this.workshopGroupList=res.data||[]
- }
- })
- //搴勫彛
- getDictList({
- dictType: 2,
+ if (res.code == 200) {
+ this.nameList = res.data || []
+ }
+ })
+ //瑙勬牸
+ getDictList({
+ dictType: 3,
}).then((res) => {
- if (res.code == 200) {
- this.marketList=res.data||[]
- }
- })
- },
- inputStart(){
- this.form.circle=this.form.startCircle+'-'+this.form.endCircle
- },
- setTable() {
- this.tableList = {
- selectIndex: false,
- headerColor: 'red',
- tableInfomation: [],
- allcol: [],
- showcol: this.showCol,
- tableColumn: this.setColumnVisible(this.showCol)
- }
- this.tableList.allcol = this.tableList.tableColumn.filter(ele => !ele.default).map(ele => ele.label);
- this.searchOptions = []
- for (let i = 0; i < this.tableList.tableColumn.length; i++) {
- const label = this.tableList.tableColumn[i].label
- const value = this.tableList.tableColumn[i].prop
- this.searchOptions.push({ value: value, label: label })
- }
- },
- setColumnVisible(showCol) {
- return this.tableColumn.map(ele => {
- return {
- ...ele,
- isShowColumn: showCol.includes(ele.label)
+ if (res.code == 200) {
+ this.specList = res.data || []
+ }
+ })
+ //缁勫埆
+ getWorkshopManageList().then((res) => {
+ if (res.code == 200) {
+ this.workshopGroupList = res.data || []
+ }
+ })
+ //搴勫彛
+ getDictList({
+ dictType: 0,
+ }).then((res) => {
+ if (res.code == 200) {
+ this.marketList = res.data || []
}
})
},
- selTableCol(val) {
- this.showcol = val;
- this.tableList.tableColumn = this.setColumnVisible(val);
+ inputStart() {
+ this.form.circle = this.form.startCircle + '-' + this.form.endCircle
},
- // 璇锋眰鏁版嵁
- async getData() {
- this.loading = true
- await getRegisterList({
- search_map: this.search_map,
- page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
+ // 浜у搧鏂板
+ addProductClick() {
+ this.productId++
+ this.tableData.push({
+ productId: this.productId,
+ position: '',
+ fineness: 0,
+ quantity: 0,
+ sum: "",
})
- .then((res) => {
- console.log(res)
- if (res.code === 200) {
- if (res.data.list && res.data.list.length > 0) {
- const list = res.data.list.map((item) => {
- let contact_name = ""
- let contact_phone = ""
- let contact_id = 0
- let contact_wechat = ""
- let contact_email = ""
- let position = ""
- if (item.contacts.length !== 0) {
- for (let i = 0; i < item.contacts.length; i++) {
- if (item.contacts[i].is_first) {
- contact_name = item.contacts[i].name
- contact_phone = item.contacts[i].phone
- contact_id = item.contacts[i].id
- contact_wechat = item.contacts[i].wechat
- contact_email = item.contacts[i].email
- position = item.contacts[i].position
- }
- }
- }
- return {
- ...item,
- contact_name: contact_name,
- contact_phone: contact_phone,
- client_level: item.client_level.name,
- client_status: item.client_status.name,
- contact_id: contact_id,
- member_name: item.member.username,
- contact_wechat: contact_wechat,
- contact_email: contact_email,
- position: position
- }
- })
- this.tableList.tableInfomation = list || []
- this.tableTwoList.tableInfomation = []
- this.pagerOptions.totalCount = res.data.count
- } else {
- this.tableList.tableInfomation = []
- }
- } else {
- this.tableList.tableInfomation = []
- this.tableTwoList.tableInfomation = []
- }
- this.loading = false
- })
- .catch((err) => {
- console.log(err)
- this.tableList.tableInfomation = []
- this.loading = false
- })
+ this.tableList.tableData = this.tableData
+ this.showSummary.show = true
},
- tabsClick(tab) {
- console.log(tab.name)
- if (tab.name === "first") {
- this.is_public = true
- } else {
- this.is_public = false
- }
- this.search_map = {
- is_public: this.is_public
- }
- this.pagerOptions.currPage = 1
- this.getData()
+ // 浜у搧鍒楄〃杈撳叆
+ inputContent(val, prop, row) {
+ this.productId = row.productId
+ this.tableData.map((item) => {
+ if (item.productId === row.productId) {
+ item[prop] = val
+ }
+ })
+ },
+ tabsClick() {
+ // if (tab.name === "first") {
+ // this.is_public = true
+ // } else {
+ // this.is_public = false
+ // }
+ this.$router.push({
+ path:"/productManage/silkRegisterForm/addPage",
+ query:{
+ activeName:this.activeName,
+ inspectID:this.inspectID,
+ id:this.registerId,
+ }
+ });
+ this.getDetailsData()
+ this.keyword = ''
},
// 鎼滅储
onFilterSearch(searchText) {
- this.search_map = {
- is_public: this.is_public,
- name: searchText
- }
+ this.keyword = searchText || ''
this.pagerOptions.currPage = 1
this.getData()
},
// 绾ゅ害鐧昏琛�
// 鏀惧純
cancelClickOne() {
+ if (this.activeName == 'first') {
+ this.form = {
+ number: '',
+ finishDate: '',
+ market: '',
+ name: '',
+ spec: '',
+ workshopGroup: '',
+ circle: '',
+ startCircle: '',
+ endCircle: '',
+ position: '',
+ }
+ this.$refs.form.resetFields();
+ this.productId = 1
+ this.tableList.tableData = [{
+ productId: 1,
+ position: '',
+ fineness: 0,
+ quantity: 0,
+ sum: "",
+ }]
+ }
+ },
+ // 绾ゅ害妫�楠岃〃
+ cancelClickTwo() {
},
// 淇濆瓨
@@ -500,21 +578,65 @@
this.$refs[formName].validate((valid) => {
if (valid) {
let form = JSON.parse(JSON.stringify(this.form));
- delete form.circle
- let params = {
- finenessList: this.tableList.tableInfomation,
- ...form
- }
- saveRegister(params).then((res) => {
- if (res.code == 200) {
- this.$message({
- message: "淇濆瓨鎴愬姛锛�",
- type: "success",
- });
+ // params.workshopGroup=Number(params.workshopGroup)
+ this.isAddloading = true
+ if (this.activeName == 'first') {
+ delete form.circle
+ let finenessList = JSON.parse(JSON.stringify(this.tableList.tableData));
+ for (let i in finenessList) {
+ delete finenessList[i].productId
}
- });
+ let params = {
+ finenessList: finenessList,
+ ...form
+ }
+ // 缂栬緫
+ if (this.inspectID) {
+ params.ID = this.form.ID?this.form.ID:Number(this.inspectID)
+ }
+ saveRegister(params).then((res) => {
+ if (res.code == 200) {
+ this.isRegisterSave=true;
+ this.$message({
+ message: "淇濆瓨鎴愬姛锛�",
+ type: "success",
+ });
+ this.$router.push({
+ path:"/productManage/silkRegisterForm",
+ });
+ }
+ this.isAddloading = false
+ }).catch(() => {
+ setTimeout(() => {
+ this.isAddloading = false;
+ }, 3000);
+ })
+ } else {
+ let paramsTwo = {
+ ...form
+ }
+ // 缂栬緫
+ if (this.registerId) {
+ paramsTwo.ID = this.form.ID?this.form.ID:Number(this.registerId)
+ }
+ saveCheck(paramsTwo).then((res) => {
+ if (res.code == 200) {
+ this.$message({
+ message: "淇濆瓨鎴愬姛锛�",
+ type: "success",
+ });
+ }
+ this.isAddloading = false
+ }).catch(() => {
+ setTimeout(() => {
+ this.isAddloading = false;
+ }, 3000);
+ })
+ }
+
} else {
console.log('error submit!!');
+
return false;
}
});
@@ -530,8 +652,8 @@
}
}
</script>
-
- <!-- Add "scoped" attribute to limit CSS to this component only -->
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
::v-deep {
.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
@@ -570,7 +692,7 @@
box-sizing: border-box;
padding: 10px 10px;
border-radius: 12px;
- height: calc(100% - 139px - 10px);
+ height: calc(100% - 139px - 10px - 20px);
width: calc(100% - 20px);
margin: 0 auto;
margin-top: 10px;
@@ -605,14 +727,16 @@
&:nth-of-type(3n) {
margin-right: 0;
}
- .select-width{
- width:100%;
+
+ .select-width {
+ width: 100%;
}
}
}
.list-view {
height: calc(100% - 0px);
+ min-height: 200px;
overflow: hidden;
}
}
@@ -702,5 +826,4 @@
}
}
}
-</style>
-
\ No newline at end of file
+</style>
\ No newline at end of file
--
Gitblit v1.8.0