From 2ea4b5772b2f879091f53f63b8a3016c54cb389f Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 28 Nov 2023 17:59:59 +0800
Subject: [PATCH] =?UTF-8?q?plm=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/properties.js                    |  14 +
 .../technicalSpecificationList.js             |   1 +
 .../base/propertiesItem/bmPropertiesModel.vue | 840 ++++++++++++++++++
 .../base/propertiesItem/propertiesItem.vue    |   2 +
 .../base/propertiesItem/propertiesModel.vue   |   1 +
 .../projectInfo/com_project_info_part.vue     |   2 +-
 .../com_bm_prepress.vue                       | 123 ++-
 7 files changed, 913 insertions(+), 70 deletions(-)
 create mode 100644 src/views/modules/base/propertiesItem/bmPropertiesModel.vue

diff --git a/src/api/base/properties.js b/src/api/base/properties.js
index f01244c..b26cb18 100644
--- a/src/api/base/properties.js
+++ b/src/api/base/properties.js
@@ -22,3 +22,17 @@ export const getItemModal = data => createAPI(`/properties/getItemModal`,'post',
 export const itemSaveData = data => createAPI(`/properties/itemSaveData`,'post',data)
 export const getItemData = data => createAPI(`/properties/getItemData`,'post',data)
 export const refreshItemModal = data => createAPI(`/properties/refreshItemModal`,'post',data)
+
+
+
+export const propertiesModelSearchForBM = data => createAPI(`/properties/propertiesModelSearchForBM`,'post',data)
+export const searchModalDetailsForBM= data => createAPI(`/properties/searchModalDetailsForBM`,'post',data)
+export const getItemListsForBM= data => createAPI(`/properties/getItemListsForBM`,'post',data)
+export const saveModalDetailsForBM= data => createAPI(`/properties/saveModalDetailsForBM`,'post',data)
+export const deleteModalDetailsForBM= data => createAPI(`/properties/deleteModalDetailsForBM`,'post',data)
+export const deleteModalDetailForBM= data => createAPI(`/properties/deleteModalDetailForBM`,'post',data)
+
+export const goUpItemForBM= data => createAPI(`/properties/goUpItemForBM`,'post',data)
+export const goDownForBM= data => createAPI(`/properties/goDownForBM`,'post',data)
+
+
diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 098a775..7ef8a0d 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -20,3 +20,4 @@ export const searchBMBom= data => createAPI(`/technicalSpecification/searchBMBom
 export const deleteBMBom= data => createAPI(`/technicalSpecification/deleteBMBom`,'post',data)
 export const searchBMRoutingDetail= data => createAPI(`/technicalSpecification/searchBMRoutingDetail`,'post',data)
 export const updateBMRoutingDetail= data => createAPI(`/technicalSpecification/updateBMRoutingDetail`,'post',data)
+export const searchBMPropertiesValue= data => createAPI(`/technicalSpecification/searchBMPropertiesValue`,'post',data)
diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
new file mode 100644
index 0000000..a5e0904
--- /dev/null
+++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
@@ -0,0 +1,840 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
+      <el-form-item :label="'BM模板编码'">
+        <el-input v-model="searchData.codeNo" style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'BM模板名称'">
+        <el-input v-model="searchData.codeDesc" style="width: 120px"></el-input>
+      </el-form-item>
+<!--      <el-form-item :label="'在用'">-->
+<!--        <el-select filterable v-model="searchData.active" style="width: 130px">-->
+<!--          <el-option label="全部" value=""></el-option>-->
+<!--          <el-option label="是" value="Y"></el-option>-->
+<!--          <el-option label="否" value="N"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item :label="' '">
+        <el-button @click="getDataList()">查询</el-button>
+        <download-excel
+          :fields="fields()"
+          :data="exportData"
+          type="xls"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{ "导出" }}
+        </download-excel>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :height="height"
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in columnList" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="100"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="detailModal(scope.row)">属性项目</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200, 500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <el-dialog title="属性项目清单" :close-on-click-modal="false" v-drag :visible.sync="detailModelFlag" width="830px">
+      <el-form :inline="true" label-position="top" @keyup.enter.native="getDataList()">
+        <el-form-item :label="'BU编码'">
+          <el-input v-model="detailData.buNo" readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'BM模板编码'">
+          <el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'BM模板名称'">
+          <el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="addFastModal()">新增</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="detailList"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in columnDetailList" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed==''?false:item.fixed"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="180"
+          label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="goUp(scope.row)">上移</a>
+            <a type="text" size="small" @click="goDown(scope.row)">下移</a>
+            <a type="text" size="small" v-if="scope.row.valueChooseFlag === 'Y'" @click="chooseModal(scope.row)">可选值</a>
+            <a type="text" size="small" @click="deleteModalDetailForBM(scope.row)">删除属性</a>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="detailModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!--    <el-dialog title="添加属性" :close-on-click-modal="false" v-drag :visible.sync="addDetailModalFlag" width="300px">-->
+    <!--      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">-->
+    <!--        <el-form-item >-->
+    <!--          <span slot="label" style="" @click="getBaseList(1024)"><a herf="#">属性属性编码</a></span>-->
+    <!--          <el-input v-model="detailData.itemNo" @blur="itemNoBlur" style="width: 120px"></el-input>-->
+    <!--        </el-form-item>-->
+    <!--        <el-form-item label="属性项目名称:">-->
+    <!--          <el-input v-model="detailData.itemDesc" disabled style="width: 120px"></el-input>-->
+    <!--        </el-form-item>-->
+    <!--      </el-form>-->
+    <!--      <el-footer style="height:40px;margin-top: 10px;text-align:center">-->
+    <!--        <el-button type="primary" @click="saveModalDetails()">保存</el-button>-->
+    <!--        <el-button type="primary" @click="addDetailModalFlag = false">关闭</el-button>-->
+    <!--      </el-footer>-->
+    <!--    </el-dialog>-->
+
+    <el-dialog title="新增" @close="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1000px">
+      <div style="font-size: 12px">
+        <!--        BM模板编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>-->
+        <!--        BM模板名称：<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>-->
+        <el-form :inline="true" label-position="top" :model="detailData">
+          <el-form-item :label="'属性编码'">
+            <el-input v-model="detailData.itemNo" style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'属性名称'">
+            <el-input v-model="detailData.itemDesc" style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="queryTemplateItem()">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-container style="margin-top: 0px;">
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >可选属性：</span>
+          <el-table
+            height="400px"
+            :data="itemList1"
+            border
+            ref="itemTable1"
+            @row-click="itemClickRow1"
+            @selection-change="selectionItem1"
+            highlight-current-row
+            v-loading="dataListLoading"
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="itemNo"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="属性编码">
+            </el-table-column>
+            <el-table-column
+              prop="itemDesc"
+              header-align="center"
+              align="center"
+              min-width="200"
+              label="属性名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+        <el-main style="width: 10px;padding: 1px">
+          <div style="margin-top: 200px;margin-left: 18px">
+            <el-button type="primary" @click="addItem()">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" @click="deleteItem()">删除<<</el-button>
+          </div>
+        </el-main>
+        <el-main style="width: 350px;padding: 1px">
+          <span style="font-size: 12px" >已有属性：</span>
+          <el-table
+            height="400px"
+            :data="itemList2"
+            border
+            ref="itemTable2"
+            @row-click="itemClickRow2"
+            @selection-change="selectionItem2"
+            highlight-current-row
+            v-loading="dataListLoading"
+            style="width: 100%">
+            <el-table-column
+              type="selection"
+              header-align="center"
+              align="center"
+              :selectable="selectFlag"
+              width="50">
+            </el-table-column>
+            <el-table-column
+              prop="itemNo"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="属性编码">
+            </el-table-column>
+            <el-table-column
+              prop="itemDesc"
+              header-align="center"
+              align="center"
+              min-width="200"
+              label="属性名称">
+            </el-table-column>
+          </el-table>
+        </el-main>
+      </el-container>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="fastAddFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="可选值" :close-on-click-modal="false" v-drag :visible.sync="chooseModalFlag" width="350px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="属性项目名称:">
+          <el-input v-model="chooseModalData.itemDesc"  disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'属性值类型'">
+          <el-select filterable v-model="chooseModalData.valueTypeDb" disabled style="width: 120px">
+            <el-option label="文本" value="T"></el-option>
+            <el-option label="数字" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :height="300"
+        :data="chooseTableData"
+        border
+        style="width: 100%">
+        <el-table-column
+          prop="availableValue"
+          header-align="center"
+          align="left"
+          min-width="200"
+          label="属性值">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="chooseModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
+<script>
+  import {
+    propertiesModelSearchForBM,
+    searchItemAvailable,
+    searchModalDetailsForBM,
+    saveModalDetailsForBM,
+    deleteModalDetailsForBM, // 多选删除
+    getItemListsForBM,
+    deleteModalDetailForBM, // 单删
+    goUpItemForBM,
+    goDownForBM,
+  } from "@/api/base/properties.js"
+  import Chooselist from '@/views/modules/common/Chooselist'
+  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  export default {
+    components: {
+      Chooselist
+    },
+    watch: {
+      searchData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.searchData.codeNo = this.searchData.codeNo.toUpperCase()
+        }
+      },
+
+      itemData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.itemData.itemNo = this.itemData.itemNo.toUpperCase()
+        }
+      },
+
+      detailData: {
+        deep: true,
+        handler: function (newV, oldV) {
+          this.detailData.codeNo = this.detailData.codeNo.toUpperCase()
+          this.detailData.itemNo = this.detailData.itemNo.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+        // 是否收藏
+        favorite: false,
+        // 导出 start
+        exportData: [],
+        exportName: "BM模板" + this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["BM模板"],
+        exportFooter: [],
+        exportList:[],
+        // 导出 end
+        tagNo:'',
+        searchData: {
+          site: this.$store.state.user.site,
+          codeNo: '',
+          codeDesc: '',
+          active:'Y',
+          functionType:'',
+          page: 1,
+          limit: 10,
+        },
+        height: 200,
+        pageIndex: 1,
+        pageSize: 50,
+        totalPage: 0,
+        // addDetailModalFlag:false,
+        modalDisableFlag:false,
+        detailData:{
+          site: this.$store.state.user.site,
+          buNo:'',
+          codeNo:'',
+          codeDesc:'',
+          functionType:'',
+          itemNo:'',
+          itemDesc:'',
+          itemType:'',
+          userId:this.$store.state.user.name
+        },
+        columnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TableBuNo',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'buNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '部门编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TableBuDesc',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'buDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '部门名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TableCodeNo',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'codeNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'BM模板编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TableCodeDesc',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'codeDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: 'BM模板名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+
+        ],
+        detailModelFlag:false,
+        detailList: [],
+        chooseTableData:[],
+        dataListLoading: false,
+        dataListSelections: [],
+        // modalDisableFlag:false,
+        chooseModalFlag:false,
+        itemFlag:'text',
+        itemData:{
+          itemNo:'',
+          valueNo:'',
+          availableValue:'',
+          itemType:'',
+          createdBy: this.$store.state.user.name
+        },
+        dataList:[],
+        departmentList:[],
+        // 展示列集
+        columnDetailList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001Table2PropertiesItemID',
+            tableId: "100003001Table2",
+            tableName: "BM模板表",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性项目编码',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001Table2PropertiesItemDesc',
+            tableId: "100003001Table2",
+            tableName: "BM模板表",
+            columnProp: 'itemDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性项目名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001Table2ValueType',
+            tableId: "100003001Table2",
+            tableName: "BM模板表",
+            columnProp: 'valueType',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性值类型',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001Table2DefaultValue',
+            tableId: "100003001Table2",
+            tableName: "BM模板表",
+            columnProp: 'defaultValue',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '参照值',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TableValueChooseFlag',
+            tableId: "100003001Table",
+            tableName: "common",
+            columnProp: 'valueChooseFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '是否值可选',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+          },
+        ],
+        levelList:[],
+        chooseModalData:{
+          site: '',
+          itemNo: '',
+          itemDesc: '',
+          itemType:'',
+          valueTypeDb:'',
+        },
+        //---------快速添加----------
+        fastAddFlag:false,
+        itemList1:[],
+        itemList2:[],
+        itemListRow1:{},
+        itemListRow2:{},
+        itemSelections1: [],
+        itemSelections2: [],
+        rules:{
+          codeNoType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          codeDescType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+          activeType:[
+            {
+              required: true,
+              message: ' ',
+              trigger: 'change'
+            }
+          ],
+        }
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = window.innerHeight - 210
+      })
+    },
+    created () {
+      this.getDataList();
+    },
+    methods: {
+
+      // 获取基础数据列表S
+      getBaseList (val,type) {
+        this.tagNo = val
+        this.$nextTick(() => {
+          let strVal = ''
+          if (val === 1024) {
+            strVal = this.detailData.itemNo
+          }
+          this.$refs.baseList.init(val, strVal)
+        })
+      },
+      /* 列表方法的回调 */
+      getBaseData (val) {
+        if (this.tagNo === 1024) {
+          this.detailData.itemNo = val.ItemNo
+          this.detailData.itemDesc = val.ItemDesc
+        }
+      },
+      //导出excel
+      async createExportData() {
+        this.searchData.limit = -1
+        this.searchData.page = 1
+        await propertiesModelSearchForBM(this.searchData).then(({data}) => {
+          this.exportList= data.page.list;
+        })
+        return this.exportList;
+      },
+      startDownload() {
+
+      },
+      finishDownload() {
+
+      },
+      fields() {
+        let json = "{"
+        this.columnList.forEach((item, index) => {
+          if (index == this.columnList.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+        return s
+      },
+      // 导出 end
+      // 获取数据列表
+      getDataList () {
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        propertiesModelSearchForBM(this.searchData).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+
+
+
+      //打开属性清单
+      detailModal(row){
+        this.detailData.buNo = row.buNo
+        this.detailData.codeNo = row.codeNo
+        this.detailData.codeDesc = row.codeDesc
+        this.detailData.functionType = row.functionType
+        searchModalDetailsForBM(this.detailData).then(({data}) => {
+          this.detailList = data.rows
+        })
+        this.detailModelFlag = true;
+      },
+      goUp(row) {
+        goUpItemForBM(row).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetailsForBM(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+            })
+          }
+        })
+
+      },
+      goDown(row) {
+        goDownForBM(row).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetailsForBM(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+            })
+          }
+        })
+
+      },
+      deleteModalDetailForBM(row){
+        this.$confirm(`是否删除这个属性项目?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteModalDetailForBM(row).then(({data}) => {
+            if (data && data.code === 0) {
+              searchModalDetailsForBM(this.detailData).then(({data}) => {
+                this.detailList = data.rows
+              })
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                }
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        }).catch(() => {
+        })
+      },
+      chooseModal(row){
+        this.chooseModalData.site = row.site;
+        this.chooseModalData.itemNo = row.itemNo;
+        this.chooseModalData.itemDesc = row.itemDesc;
+        this.chooseModalData.valueTypeDb = row.valueTypeDb;
+        this.chooseModalData.itemType=row.functionType;
+        searchItemAvailable(this.chooseModalData).then(({data}) => {
+          this.chooseTableData = data.rows
+        })
+        this.chooseModalFlag = true;
+      },
+      //---------快速添加----------
+
+      queryTemplateItem(){
+        getItemListsForBM(this.detailData).then(({data}) => {
+          this.itemList1 = data.row1;
+          this.itemList2 = data.row2;
+        })
+      },
+
+      addFastModal(){
+        this.itemSelections1 = null
+        this.itemSelections2 = null
+        getItemListsForBM(this.detailData).then(({data}) => {
+          this.itemList1 = data.row1;
+          this.itemList2 = data.row2;
+        })
+        this.fastAddFlag = true;
+      },
+      // 可选属性
+      itemClickRow1(row){
+        this.$refs.itemTable1.toggleRowSelection(row);
+      },
+      // 已有属性
+      itemClickRow2(row){
+        this.$refs.itemTable2.toggleRowSelection(row);
+      },
+      selectFlag(){
+        return true;
+      },
+      selectionItem1(val){
+        this.itemSelections1 = val
+      },
+      selectionItem2(val){
+        this.itemSelections2 = val
+      },
+      addItem(){
+        if(this.itemSelections1 == null || this.itemSelections1.length == 0){
+          this.$alert("请选择可选属性！", '提示', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          buNo: this.detailData.buNo,
+          codeNo: this.detailData.codeNo,
+          codeDesc: this.detailData.codeDesc,
+          functionType: this.detailData.functionType,
+          // itemNo: this.itemListRow1.itemNo,
+          // itemDesc: this.itemListRow1.itemDesc,
+          itemList: this.itemSelections1,
+          itemType: this.detailData.itemType,
+          userId: this.$store.state.user.name
+        }
+        saveModalDetailsForBM(inData).then(({data}) => {
+          if (data && data.code == 0) {
+            getItemListsForBM(this.detailData).then(({data}) => {
+              this.itemList1 = data.row1;
+              this.itemList2 = data.row2;
+            })
+            this.itemSelections1 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      deleteItem(){
+        if(this.itemSelections2 == null || this.itemSelections2.length == 0){
+          this.$alert("请选择已有属性！", '提示', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        let inData = {
+          site: this.$store.state.user.site,
+          buNo: this.detailData.buNo,
+          codeNo:this.detailData.codeNo,
+          codeDesc:this.detailData.codeDesc,
+          functionType:this.detailData.functionType,
+          // itemNo: this.itemListRow2.itemNo,
+          // itemDesc:this.itemListRow2.itemDesc,
+          itemList: this.itemSelections2,
+          itemType:this.detailData.itemType,
+          userId:this.$store.state.user.name
+        }
+        deleteModalDetailsForBM(inData).then(({data}) => {
+          if (data && data.code === 0) {
+            getItemListsForBM(this.detailData).then(({data}) => {
+              this.itemList1 = data.row1;
+              this.itemList2 = data.row2;
+            })
+            this.itemSelections2 = []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      refreshDetailList(){
+        searchModalDetailsForBM(this.detailData).then(({data}) => {
+          this.detailList = data.rows
+        })
+      },
+    }
+  }
+</script>
diff --git a/src/views/modules/base/propertiesItem/propertiesItem.vue b/src/views/modules/base/propertiesItem/propertiesItem.vue
index 4ab6738..2125bdb 100644
--- a/src/views/modules/base/propertiesItem/propertiesItem.vue
+++ b/src/views/modules/base/propertiesItem/propertiesItem.vue
@@ -12,6 +12,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="A" value="A"></el-option>
           <el-option label="B" value="B"></el-option>
+          <el-option label="BM" value="BM"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
@@ -111,6 +112,7 @@
           <el-select filterable v-model="modalData.itemType" :disabled="modalDisableFlag" style="width: 120px">
             <el-option label="A" value="A"></el-option>
             <el-option label="B" value="B"></el-option>
+            <el-option label="BM" value="BM"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="'是否值可选'" prop="valueChooseFlag" :rules="rules.valueChooseFlagType">
diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue
index f34fc47..208bfb1 100644
--- a/src/views/modules/base/propertiesItem/propertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/propertiesModel.vue
@@ -995,6 +995,7 @@
         this.chooseModalData.itemNo = row.itemNo;
         this.chooseModalData.itemDesc = row.itemDesc;
         this.chooseModalData.valueTypeDb = row.valueTypeDb;
+        this.chooseModalData.itemType=row.functionType;
         searchItemAvailable(this.chooseModalData).then(({data}) => {
           this.chooseTableData = data.rows
         })
diff --git a/src/views/modules/project/projectInfo/com_project_info_part.vue b/src/views/modules/project/projectInfo/com_project_info_part.vue
index 6e71674..95f6abb 100644
--- a/src/views/modules/project/projectInfo/com_project_info_part.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_part.vue
@@ -107,7 +107,7 @@
         <el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="工具属性清单" :close-on-click-modal="false" v-drag :visible.sync="partItemModelFlag" width="830px">
+    <el-dialog title="属性清单" :close-on-click-modal="false" v-drag :visible.sync="partItemModelFlag" width="830px">
       <el-form :inline="true" label-position="top" >
         <el-form-item >
           <!--          <el-button  type="primary" @click="addItemModal()">新增</el-button>-->
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
index 02b9618..18c611c 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_prepress.vue
@@ -1,71 +1,59 @@
 <template>
   <div class="mod-config">
-    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo==='Flexo'||searchData.buNo==='DBE'">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" >
       <el-form-item >
-        <el-button type="primary" @click="searchTable()" >刷新</el-button>
+        <el-button type="primary" @click="refreshModal()" >更新模板</el-button>
+        <el-button type="primary" @click="searchTable()" >刷新数据</el-button>
         <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>
       </el-form-item>
-
-      <el-table
-        :height="height"
-        :data="tableData"
-        border
-        style="width: 100%">
-        <el-table-column
-          prop=""
-          header-align="center"
-          align="center"
-          min-width="30"
-          v-if="!ifDisableFlag"
-          label="操作">
-          <template slot-scope="scope">
-            <a type="text" size="small" @click="updateData(scope.row)">编辑</a>
-            <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="familyName"
-          header-align="center"
-          align="left"
-          min-width="60"
-          label="材料分类">
-        </el-table-column>
-        <el-table-column
-          prop="erpPartNo"
-          header-align="center"
-          align="left"
-          min-width="60"
-          label="IFS料号">
-        </el-table-column>
-        <el-table-column
-          prop="partDesc"
-          header-align="center"
-          align="left"
-          min-width="120"
-          label="材料名称">
-        </el-table-column>
-        <el-table-column
-          prop="quantity"
-          header-align="center"
-          align="left"
-          min-width="60"
-          label="数量">
-        </el-table-column>
-        <el-table-column
-          prop="spec"
-          header-align="center"
-          align="left"
-          min-width="120"
-          label="UL产品型号">
-        </el-table-column>
-        <el-table-column
-          prop="remark"
-          header-align="center"
-          align="left"
-          min-width="180"
-          label="Remark">
-        </el-table-column>
-      </el-table>
+      <div class="rq ">
+        <el-table
+          :height="height"
+          :data="tableData"
+          border
+          style="width: 100%">
+          <el-table-column
+            prop="itemNo"
+            header-align="center"
+            align="left"
+            width="60"
+            label="属性编码">
+          </el-table-column>
+          <el-table-column
+            prop="itemDesc"
+            header-align="center"
+            align="left"
+            width="100"
+            label="属性名称">
+          </el-table-column>
+          <el-table-column
+            header-align="center"
+            align="left"
+            min-width="400"
+            label="值">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.textValue" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'N'" v-model="scope.row.numberValue" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-select v-if="scope.row.valueTypeDb === 'T'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.textValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+                <el-option
+                  v-for="item in scope.row.availableList"
+                  :key="index"
+                  :label="item.availableValue"
+                  :value="item.availableValue">
+                </el-option>
+              </el-select>
+              <el-select v-if="scope.row.valueTypeDb === 'N'&&scope.row.valueChooseFlag === 'Y'" v-model="scope.row.numberValue" placeholder="请选择" style="height: 11px;padding: 0px " allow-create>
+                <el-option
+                  v-for="item in scope.row.availableList"
+                  :key="index"
+                  :label="item.availableValue"
+                  :value="item.availableValue">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </el-form>
 
   </div>
@@ -73,10 +61,7 @@
 
 <script>
   import {
-    searchBMBom,
-    saveBMBom,
-    searchPartDataForSelect,
-    deleteBMBom,
+    searchBMPropertiesValue
   } from "@/api/sampleManagement/technicalSpecificationList.js"
 
   export default {
@@ -96,7 +81,7 @@
         },
         type:'prepress',
         ifDisableFlag:false,
-
+        tableData:[],
       }
     },
     mounted () {
@@ -118,7 +103,7 @@
 
       },
       searchTable(){
-        searchBMBom(this.searchData).then(({data}) => {
+        searchBMPropertiesValue(this.searchData).then(({data}) => {
           this.tableData = data.rows;
 
         });