diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
new file mode 100644
index 0000000..e040803
--- /dev/null
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -0,0 +1,3 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+export const technicalSpecificationListSearch = data => createAPI(`/technicalSpecification/technicalSpecificationListSearch`,'post',data)
diff --git a/src/main.js b/src/main.js
index 923b7c9..789fd1c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,11 +18,13 @@ import decimalUtil from '@/utils/decimalUtil.js'
import getLodop from '@/utils/LodopFuncs.js'
import pdf from 'vue-pdf'
import { debounce,throttle} from '@/utils/common.js'
+import yzz from '@/views/common/yzz.vue'
Vue.component('downloadExcel', JsonExcel)
Vue.component('pdf', pdf)
Vue.use(VueCookie)
Vue.config.productionTip = false
+Vue.component('yzz', yzz);
// 非生产环境, 适配mockjs模拟数据 // api: https://github.com/nuysoft/Mock
if (process.env.NODE_ENV !== 'production') {
diff --git a/src/views/common/yzz.vue b/src/views/common/yzz.vue
new file mode 100644
index 0000000..25a96a2
--- /dev/null
+++ b/src/views/common/yzz.vue
@@ -0,0 +1,32 @@
+
+
+ 大傻逼
+
+
+
+
+
+
diff --git a/src/views/demo/demo.vue b/src/views/demo/demo.vue
index 1c8e35b..0d99023 100644
--- a/src/views/demo/demo.vue
+++ b/src/views/demo/demo.vue
@@ -26,7 +26,7 @@
v-loading="dataListLoading"
style="width: 100%; ">
+
+
{
+ // if (data.code == 0) {
+ // this.dataList1 = data.page.list
+ // this.pageIndex = data.page.currPage
+ // this.pageSize = data.page.pageSize
+ // this.totalPage = data.page.totalCount
+ // if(this.dataList1.length>0){
+ // this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
+ // this.changeData(this.dataList1[0])
+ // }
+ // }
+ // this.dataListLoading = false
+ // })
+ },
searchTable(){
getProjectInfoPartList(this.searchData).then(({data}) => {
//区分请求成功和失败的状况
@@ -505,8 +547,8 @@
},
fields() {
let json = "{"
- this.columnList.forEach((item, index) => {
- if (index == this.columnList.length - 1) {
+ this.columnList1.forEach((item, index) => {
+ if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 8f850c1..577ebfb 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -331,7 +331,7 @@
addOrUpdateVisible:false,
searchData:{
page: 1,
- limit: 10,
+ limit: 100,
site:this.$store.state.user.site,
projectId:'',
projectType:'',
@@ -1201,12 +1201,12 @@
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
- this.getDataList()
+ this.search()
},
// 当前页
currentChangeHandle (val) {
this.pageIndex = val
- this.getDataList()
+ this.search()
},
// 动态列开始 获取 用户保存的 格式列
async getTableUserColumn(tableId, columnId) {
diff --git a/src/views/modules/sampleManagement/demoZuJian.vue b/src/views/modules/sampleManagement/demoZuJian.vue
new file mode 100644
index 0000000..de00546
--- /dev/null
+++ b/src/views/modules/sampleManagement/demoZuJian.vue
@@ -0,0 +1,481 @@
+
+
+
+
+ 新增
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+ 物料类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/technicalSpecificationList/com_technical-add-or-update.vue
new file mode 100644
index 0000000..201e2ac
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationList/com_technical-add-or-update.vue
@@ -0,0 +1,696 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 项目类型
+
+
+
+ 所属客户
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 项目来源
+
+
+
+ 优先级
+
+
+
+
+
+
+
+
+
+ 项目经理
+
+
+
+ 项目负责人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 项目权限
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue
new file mode 100644
index 0000000..8c3e8eb
--- /dev/null
+++ b/src/views/modules/sampleManagement/technicalSpecificationList/technicalSpecificationList.vue
@@ -0,0 +1,606 @@
+
+
+
+
+
+
+
+ 测试料号
+
+
+
+
+
+
+ 查询
+ 新增
+
+ {{ '导出' }}
+
+
+
+
+
+
+ {{ scope.row[item.columnProp] }}
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 物料类型
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+