diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index e1b8aea..b6de691 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -598,24 +598,24 @@
             fixed: '',
             columnWidth: 200
           },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 101002001,
-            serialNumber: '101002001Table1Status',
-            tableId: "101002001Table1",
-            tableName: "项目信息主表",
-            columnProp: "status",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "项目状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
+          // {
+          //   userId: this.$store.state.user.name,
+          //   functionId: 101002001,
+          //   serialNumber: '101002001Table1Status',
+          //   tableId: "101002001Table1",
+          //   tableName: "项目信息主表",
+          //   columnProp: "status",
+          //   headerAlign: "center",
+          //   align: "left",
+          //   columnLabel: "项目状态",
+          //   columnHidden: false,
+          //   columnImage: false,
+          //   columnSortable: false,
+          //   sortLv: 0,
+          //   status: true,
+          //   fixed: '',
+          //   columnWidth: 100
+          // },
           {
             userId: this.$store.state.user.name,
             functionId: 101002001,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
index a304ce0..87b9702 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
@@ -509,7 +509,7 @@
       // 获取流程的配置权限
       getNodeAuthority (row) {
         getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'){
+          if(data.status==='已完成'||data.status==='已升版'){
             this.ifDisableFlag=true
             return false
           }else {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
index 1006c5b..eec9517 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
@@ -351,7 +351,7 @@
       // 获取流程的配置权限
       getNodeAuthority (row) {
         getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'){
+          if(data.status==='已完成'||data.status==='已升版'){
             this.ifDisableFlag=true
             return false
           }else {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
index 0c8b70b..5562c70 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
@@ -255,7 +255,7 @@
       // 获取流程的配置权限
       getNodeAuthority (row) {
         getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'){
+          if(data.status==='已完成'||data.status==='已升版'){
             this.ifDisableFlag=true
             return false
           }else {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
index 6d5c1a8..4faed01 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
@@ -1452,7 +1452,7 @@
       // 获取流程的配置权限
       getNodeAuthority (row) {
         getBMStatusDesc(this.searchData).then(({data})=>{
-          if(data.status==='已完成'){
+          if(data.status==='已完成'||data.status==='已升版'){
             this.ifDisableFlag=true
             return false
           }else {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
index d14b830..f1fad55 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
@@ -702,7 +702,7 @@
       // 获取流程的配置权限
        getNodeAuthority (row) {
          getBMStatusDesc(this.searchData).then(({data})=>{
-           if(data.status==='已完成'){
+           if(data.status==='已完成'||data.status==='已升版'){
              this.ifDisableFlag=true
              return false
            }else {
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index ab6885c..2ddb18b 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -65,10 +65,10 @@
         label="操作">
         <template slot-scope="scope">
 <!--          <a type="text" size="small" @click="addRevModel(scope.row)" v-if="scope.row.statusDesc!=='已完成'">升版</a>-->
-          <a type="text" size="small" v-if="scope.row.statusDesc==='已完成'" @click="jumpDetail(scope.row)">详情</a>
-          <a type="text" size="small" v-if="scope.row.statusDesc!=='已完成'" @click="jumpDetail(scope.row)">修改</a>
+          <a type="text" size="small" v-if="scope.row.statusDesc==='已完成'||scope.row.statusDesc==='已升版'" @click="jumpDetail(scope.row)">详情</a>
+          <a type="text" size="small" v-if="scope.row.statusDesc!=='已完成'&&scope.row.statusDesc!=='已升版'" @click="jumpDetail(scope.row)">修改</a>
 <!--          <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.statusDesc!=='已完成'">修改</a>-->
-          <a type="text" size="small" @click="deleteData(scope.row)" v-if="scope.row.statusDesc!=='已完成'">删除</a>
+          <a type="text" size="small" @click="deleteData(scope.row)" v-if="scope.row.statusDesc!=='已完成'&&scope.row.statusDesc!=='已升版'">删除</a>
           <a type="text" size="small" v-if="scope.row.status === 'cg'" @click="issueModal(scope.row)">下达</a>
         </template>
       </el-table-column>
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 5959224..a4498ad 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -579,6 +579,9 @@
           align="center"
           min-width="25"
           label="">
+          <template slot="header" slot-scope="scope">
+            <el-checkbox :indeterminate="saveCheckAllIndeterminate" v-model="saveCheckAll" true-label="Y" false-label="N" @change="changeSaveCheckAll"></el-checkbox>
+          </template>
           <template slot-scope="scope">
             <!-- 如果数据为Y，显示勾选框，否则不勾选 -->
             <el-checkbox v-model="scope.row.checkAll"  @change="changeAll(scope.row)"></el-checkbox>
@@ -670,6 +673,7 @@ import {
 export default {
   data() {
     return {
+      saveCheckAll:'N',
       accessSiteVisible: false,
       projectRoleFlag: false,
       projectRoleList: [],
@@ -840,6 +844,20 @@ export default {
   components: {
     AddOrUpdate
   },
+  computed:{
+    saveCheckAllIndeterminate(){
+      if (this.projectRoleList.every(item => item.checkAll === true)){
+        this.saveCheckAll = 'Y'
+        return false
+      }else if (this.projectRoleList.every(item => item.checkAll === false)){
+        this.saveCheckAll = 'N'
+        return false
+      }else {
+        this.saveCheckAll = 'N'
+        return true
+      }
+    },
+  },
   activated() {
     this.getDataList()
   },
@@ -850,6 +868,13 @@ export default {
     })
   },
   methods: {
+    changeSaveCheckAll(val){
+      for (let i = 0; i < this.projectRoleList.length; i++) {
+        let row = this.projectRoleList[i]
+        row.checkAll = (val === 'Y')
+        this.changeAll(row)
+      }
+    },
     // 获取button的词典
     getFunctionButtonList() {
       let queryButton = {
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 1eedbeb..e6526e4 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -274,8 +274,8 @@
                     <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                        style="width: 100px; height: 80px"/></span>
                   </div>
-                  <div v-if=" (item.columnProp === 'standardCost')">
-                    <el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)"  placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
+                  <div v-else-if=" (item.columnProp === 'standardCost')">
+                    <el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)"  placeholder="请输入成本"
                               style="width:98%"></el-input>
                   </div>
                   <div v-else>
@@ -416,12 +416,12 @@
                 :label="item.columnLabel">
                 <template slot-scope="scope">
                   <div v-if="(item.columnProp !== 'applyQty')&& (item.columnProp !== 'standardCost')">
-                  <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>
+                    <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>
                   </div>
-                  <div v-if=" (item.columnProp === 'standardCost')">
-                    <el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)"  placeholder="请输入数量"
+                  <div v-else-if=" (item.columnProp === 'standardCost')">
+                    <el-input v-model="scope.row.standardCost" type="number" @change="changeSum(scope.row)"  placeholder="请输入成本"
                               style="width:98%"></el-input>
                   </div>
                   <div v-else>
diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue
index 59363e4..c6f5446 100644
--- a/src/views/modules/tooling/toolingInfo.vue
+++ b/src/views/modules/tooling/toolingInfo.vue
@@ -154,7 +154,7 @@
           <el-table-column label="工具数量" width="60" prop="toolQty" show-overflow-tooltip/>
           <el-table-column label="申请数量" width="70" prop="applyQty" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)"  placeholder="请输入数量" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
+              <el-input v-model="scope.row.applyQty" type="number" @change="changeSum(scope.row)"  placeholder="请输入成本" onkeyup="value=value.replace(/^(0+)|[^\d]+/g,'')"
                         style="width:98%"></el-input>
             </template>
           </el-table-column>
@@ -166,7 +166,7 @@
           </el-table-column>
           <el-table-column label="物料编码" width="100" prop="partNo" show-overflow-tooltip/>
           <el-table-column label="物料名称" width="160" prop="partName" show-overflow-tooltip/>
-          <el-table-column label="Ifs料号" width="100" prop="finalPartNo" show-overflow-tooltip/>
+          <el-table-column label="IFS料号" width="100" prop="finalPartNo" show-overflow-tooltip/>
           <el-table-column label="客户料号" width="100" prop="customerPartNo" show-overflow-tooltip/>
           <el-table-column label="工艺版本" width="80" prop="routingRevision" show-overflow-tooltip/>
           <el-table-column label="工艺类型" width="80" prop="routingType" show-overflow-tooltip/>