From 774ae4bf1ddae9d7e1275e9b7c3ef9ca930bb80c Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 19 Dec 2023 18:12:05 +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                    |   5 +
 .../technicalSpecificationList.js             |   1 +
 .../base/propertiesItem/bmPropertiesModel.vue | 425 ++++++++++++------
 .../base/propertiesItem/propertiesModel.vue   |  38 +-
 .../technicalSpecificationDetail.vue          |  22 +-
 5 files changed, 340 insertions(+), 151 deletions(-)

diff --git a/src/api/base/properties.js b/src/api/base/properties.js
index 9151837..c0d469b 100644
--- a/src/api/base/properties.js
+++ b/src/api/base/properties.js
@@ -38,3 +38,8 @@ export const goUpItemForBM= data => createAPI(`/properties/goUpItemForBM`,'post'
 export const goDownForBM= data => createAPI(`/properties/goDownForBM`,'post',data)
 
 
+export const goUpItem= data => createAPI(`/properties/goUpItem`,'post',data)
+export const goDownItem= data => createAPI(`/properties/goDownItem`,'post',data)
+
+export const updateBMModal= data => createAPI(`/technicalSpecification/updateBMModal`,'post',data)
+
diff --git a/src/api/sampleManagement/technicalSpecificationList.js b/src/api/sampleManagement/technicalSpecificationList.js
index 2121b8e..fc72033 100644
--- a/src/api/sampleManagement/technicalSpecificationList.js
+++ b/src/api/sampleManagement/technicalSpecificationList.js
@@ -48,3 +48,4 @@ export const updateBMPrintOtherDetail= data => createAPI(`/technicalSpecificatio
 export const searchBMPrintOtherColor= data => createAPI(`/technicalSpecification/searchBMPrintOtherColor`,'post',data)
 export const saveBMPrintOtherColor= data => createAPI(`/technicalSpecification/saveBMPrintOtherColor`,'post',data)
 export const deleteBMPrintOtherColor= data => createAPI(`/technicalSpecification/deleteBMPrintOtherColor`,'post',data)
+
diff --git a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
index 4ad113d..d85de37 100644
--- a/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/bmPropertiesModel.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'BM模板编码'">
+      <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-form-item :label="'BM模块名称'">
         <el-input v-model="searchData.codeDesc" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'BU编码'">
@@ -12,8 +12,15 @@
       </el-form-item>
       <el-form-item :label="'是否启用'">
         <el-select clearable v-model="searchData.active" style="width: 120px">
-          <el-option label="是" value="Y"></el-option>
-          <el-option label="否" value="N"></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+          <el-option label="全部" value=""></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'是否可编辑'">
+        <el-select clearable v-model="searchData.editFlag" style="width: 120px">
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
           <el-option label="全部" value=""></el-option>
         </el-select>
       </el-form-item>
@@ -67,10 +74,11 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="100"
+        width="120"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" @click="detailModal(scope.row)">属性项目</a>
+          <a type="text" size="small" @click="editModal(scope.row)">编辑</a>
+          <a type="text" size="small" v-if="scope.row.editFlag==='Y'" @click="detailModal(scope.row)">属性项目</a>
         </template>
       </el-table-column>
     </el-table>
@@ -89,14 +97,14 @@
         <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-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-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 :label="'属性模板'">
+          <el-input v-model="detailData.propertiesCodeNo" readonly style="width: 120px"></el-input>
         </el-form-item>
       </el-form>
       <el-table
@@ -105,17 +113,17 @@
         border
         v-loading="dataListLoading"
         style="width: 100%;">
-        <el-table-column
-          fixed="left"
-          header-align="center"
-          align="center"
-          width="70"
-          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>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          fixed="left"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="70"-->
+<!--          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>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
           v-for="(item,index) in columnDetailList" :key="index"
           :sortable="item.columnSortable"
@@ -139,7 +147,6 @@
           label="操作">
           <template slot-scope="scope">
             <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>
@@ -148,122 +155,136 @@
       </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="编辑BM模块" :close-on-click-modal="false" v-drag :visible.sync="editModalFlag" width="440px">
+          <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+            <el-form-item label="BU编码:">
+              <el-input v-model="editData.buNo" readonly style="width: 120px"></el-input>
+            </el-form-item>
+            <el-form-item label="BM模块编码:">
+              <el-input v-model="editData.codeNo" readonly style="width: 120px"></el-input>
+            </el-form-item>
+            <el-form-item label="是否可编辑:">
+              <el-input v-model="editData.editFlag" readonly style="width: 120px"></el-input>
+            </el-form-item>
+          </el-form>
+          <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+            <el-form-item label="是否启用:">
+              <el-select clearable v-model="editData.active"  style="width: 120px">
+                <el-option label="Y" value="Y"></el-option>
+                <el-option label="N" value="N"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item >
+              <span slot="label" style="" @click="getBaseList(21)"><a herf="#">属性模板编码</a></span>
+              <el-input v-model="editData.propertiesCodeNo" :disabled="editData.editFlag==='N'" 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="updateBMModal()">保存</el-button>
+            <el-button type="primary" @click="editModalFlag = 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="refreshDetailList" :close-on-click-modal="false" v-drag :visible.sync="fastAddFlag" width="1000px">-->
+<!--      <div style="font-size: 12px">-->
+<!--        &lt;!&ndash;        BM模块编码：<el-input v-model="detailData.codeNo" readonly style="width: 120px"></el-input>&ndash;&gt;-->
+<!--        &lt;!&ndash;        BM模块名称：<el-input v-model="detailData.codeDesc" readonly style="width: 120px"></el-input>&ndash;&gt;-->
+<!--        <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;">
@@ -309,6 +330,7 @@
     deleteModalDetailForBM, // 单删
     goUpItemForBM,
     goDownForBM,
+    updateBMModal,
   } from "@/api/base/properties.js"
   import Chooselist from '@/views/modules/common/Chooselist'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -358,6 +380,7 @@
           buNo:'',
           active:'Y',
           functionType:'',
+          editFlag:'',
           page: 1,
           limit: 10,
         },
@@ -365,7 +388,6 @@
         pageIndex: 1,
         pageSize: 50,
         totalPage: 0,
-        // addDetailModalFlag:false,
         modalDisableFlag:false,
         detailData:{
           site: this.$store.state.user.site,
@@ -376,6 +398,7 @@
           itemNo:'',
           itemDesc:'',
           itemType:'',
+          propertiesCodeNo:'',
           userId:this.$store.state.user.name
         },
         columnList: [
@@ -388,13 +411,14 @@
             columnProp: 'buNo',
             headerAlign: "center",
             align: "center",
-            columnLabel: '部门编码',
+            columnLabel: 'BU编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 50
           },
           {
             userId: this.$store.state.user.name,
@@ -405,13 +429,14 @@
             columnProp: 'buDesc',
             headerAlign: "center",
             align: "center",
-            columnLabel: '部门名称',
+            columnLabel: 'BU名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 70
           },
           {
             userId: this.$store.state.user.name,
@@ -422,13 +447,14 @@
             columnProp: 'codeNo',
             headerAlign: "center",
             align: "center",
-            columnLabel: 'BM模板编码',
+            columnLabel: 'BM模块编码',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 90
           },
           {
             userId: this.$store.state.user.name,
@@ -439,13 +465,50 @@
             columnProp: 'codeDesc',
             headerAlign: "center",
             align: "center",
-            columnLabel: 'BM模板名称',
+            columnLabel: 'BM模块名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TablePropertiesCodeNo',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'propertiesCodeNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性模板',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TablePropertiesCodeDesc',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'propertiesCodeDesc',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '属性模板名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
           },
           {
             userId: this.$store.state.user.name,
@@ -463,6 +526,24 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 60
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 100003001,
+            serialNumber: '100003001TableEditFlag',
+            tableId: "100003001Table",
+            tableName: "BM模板表",
+            columnProp: 'editFlag',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '是否可编辑',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
           },
 
         ],
@@ -501,6 +582,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 60
           },
           {
             userId: this.$store.state.user.name,
@@ -518,6 +600,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100
           },
           {
             userId: this.$store.state.user.name,
@@ -535,6 +618,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 60
           },
           {
             userId: this.$store.state.user.name,
@@ -552,6 +636,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 60
           },
           {
             userId: this.$store.state.user.name,
@@ -569,6 +654,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 60
           },
         ],
         levelList:[],
@@ -579,6 +665,15 @@
           itemType:'',
           valueTypeDb:'',
         },
+        editData:{
+          site:'',
+          buNo:'',
+          codeNo:'',
+          editFlag:'',
+          active:'',
+          propertiesCodeNo:'',
+        },
+        editModalFlag:false,
         //---------快速添加----------
         fastAddFlag:false,
         itemList1:[],
@@ -627,17 +722,16 @@
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = ''
-          if (val === 1024) {
-            strVal = this.detailData.itemNo
+          if (val === 21) {
+            strVal = this.editData.propertiesCodeNo
           }
           this.$refs.baseList.init(val, strVal)
         })
       },
       /* 列表方法的回调 */
       getBaseData (val) {
-        if (this.tagNo === 1024) {
-          this.detailData.itemNo = val.ItemNo
-          this.detailData.itemDesc = val.ItemDesc
+        if (this.tagNo === 21) {
+          this.editData.propertiesCodeNo = val.Code_no
         }
       },
       //导出excel
@@ -701,6 +795,7 @@
       detailModal(row){
         this.detailData.buNo = row.buNo
         this.detailData.codeNo = row.codeNo
+        this.detailData.propertiesCodeNo = row.propertiesCodeNo
         this.detailData.codeDesc = row.codeDesc
         this.detailData.functionType = row.functionType
         searchModalDetailsForBM(this.detailData).then(({data}) => {
@@ -872,6 +967,42 @@
           this.detailList = data.rows
         })
       },
+      editModal(row){
+        this.editData={
+          site:row.site,
+          buNo:row.buNo,
+          codeNo:row.codeNo,
+          editFlag:row.editFlag,
+          active:row.active,
+          propertiesCodeNo:row.propertiesCodeNo,
+        }
+        this.editModalFlag=true;
+      },
+      updateBMModal(){
+        this.$confirm("是否保存信息？", '保存提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+        updateBMModal(this.editData).then(({data}) => {
+          if (data && data.code == 0) {
+            this.getDataList()
+            this.editModalFlag=false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          return
+        })
+        })
+      },
     }
   }
 </script>
diff --git a/src/views/modules/base/propertiesItem/propertiesModel.vue b/src/views/modules/base/propertiesItem/propertiesModel.vue
index 208bfb1..a30ce05 100644
--- a/src/views/modules/base/propertiesItem/propertiesModel.vue
+++ b/src/views/modules/base/propertiesItem/propertiesModel.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="'在用'">
@@ -123,6 +124,7 @@
           <el-select filterable v-model="modalData.functionType" 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="active" :rules="rules.activeType">
@@ -157,6 +159,17 @@
         border
         v-loading="dataListLoading"
         style="width: 100%;">
+        <el-table-column
+          fixed="left"
+          header-align="center"
+          align="center"
+          width="70"
+          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>
+          </template>
+        </el-table-column>
         <el-table-column
           v-for="(item,index) in columnDetailList" :key="index"
           :sortable="item.columnSortable"
@@ -350,7 +363,9 @@
     saveModalDetails,
     deleteModalDetails, // 多选删除
     getItemLists,
-    deleteModalDetail // 单删
+    deleteModalDetail, // 单删
+    goUpItem,
+    goDownItem,
   } from "@/api/base/properties.js"
   import Chooselist from '@/views/modules/common/Chooselist'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
@@ -1105,6 +1120,27 @@
           this.detailList = data.rows
         })
       },
+
+      goUp(row) {
+        goUpItem(row).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetails(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+            })
+          }
+        })
+
+      },
+      goDown(row) {
+        goDownItem(row).then(({data}) => {
+          if (data && data.code === 0) {
+            searchModalDetails(this.detailData).then(({data}) => {
+              this.detailList = data.rows
+            })
+          }
+        })
+
+      },
     }
   }
 </script>
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
index 1ae5427..83e5261 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/technicalSpecificationDetail.vue
@@ -157,17 +157,20 @@
         this.getPageRole()
       }
       this.$nextTick(() => {
-        //页签大小铺满网页
-        var tabsElement = document.querySelector('.tabs');
-        tabsElement.style.minHeight = window.innerHeight+'px';
+
+        this.changeHeightAuto();
         this.refreshCurrentTabTable()
       })
     },
     methods: {
       refreshCurrentTabTable(){
+        //先调整页面的高度
+        this.changeHeightAuto()
         if (this.activeName == 'baseInfo') {
           this.getBaseInfoData();
         }else if(this.activeName == 'customerInfo'){
+          //有的页面要高一点
+          this.changeHeight(800);
           this.getCustomerInfo();
         }else if(this.activeName == 'packageInfo'){
           this.getPackageInfo();
@@ -176,6 +179,7 @@
         }else if(this.activeName == 'routing'){
           this.getRouting();
         }else if(this.activeName == 'prepress'){
+          this.changeHeight(800);
           this.getPrepress();
         }else if(this.activeName == 'technicalRequirement'){
           this.getTechnicalRequirement();
@@ -210,6 +214,7 @@
         }else if(this.activeName == 'cqeComfirm'){
           this.getCqeComfirm();
         }else if(this.activeName == 'tpInfo'){
+          this.changeHeight(800);
           this.getTpInfo();
         }else if(this.activeName == 'printOther'){
           this.getPrintOther();
@@ -320,6 +325,17 @@
       getPageIf(key){
         return this.pageRole.indexOf(key) !== -1 || false
       },
+
+      changeHeight(height){
+        var tabsElement = document.querySelector('.tabs');
+        // tabsElement.style.minHeight = window.innerHeight+'px';
+        tabsElement.style.minHeight =height +'px';
+      },
+      changeHeightAuto(){
+        //页签大小铺满网页
+        var tabsElement = document.querySelector('.tabs');
+        tabsElement.style.minHeight = window.innerHeight+'px';
+      }
     },
   }
 </script>