diff --git a/debug.log b/debug.log
deleted file mode 100644
index 406a012..0000000
--- a/debug.log
+++ /dev/null
@@ -1,5 +0,0 @@
-[0202/091751.774:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0202/114523.157:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0208/090116.538:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0225/090935.420:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
-[0226/092705.472:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)
diff --git a/src/views/modules/common/Chooselist.vue b/src/views/modules/common/Chooselist.vue
index 151d62a..ef177cb 100644
--- a/src/views/modules/common/Chooselist.vue
+++ b/src/views/modules/common/Chooselist.vue
@@ -177,7 +177,8 @@ export default {
       if (this.param3) {
         sql += " and active like '%" + this.param3 + "%'"
       }
-      if (this.tagNo <1000){
+      if (this.tagNo <1000 && this.tagNo !== 93){
+        console.log(this.tagNo)
         if (this.param4) {
           sql += " and site=" + this.param4
         }
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index ed0c373..068822f 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -15,7 +15,6 @@
       </el-form-item>
       <el-form-item size="mini" label="鎺堟潈">
         <el-tree
-
           :data="menuList"
           :props="menuListTreeProps"
           node-key="menuId"
@@ -86,7 +85,14 @@ export default {
               if (idx !== -1) {
                 data.role.menuIdList.splice(idx, data.role.menuIdList.length - idx)
               }
-              this.$refs.menuListTree.setCheckedKeys(data.role.menuIdList)
+            console.log(data.role.menuIdList)
+              let x1 = data.role.menuIdList.map(Number)
+              console.log(x1)
+              this.$nextTick(() => {
+                for (let x1Element of x1) {
+                  this.$refs.menuListTree.setChecked(x1Element,true,false)
+                }
+              })
             }
           })
         }
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index d87e03c..375d6b7 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -5,9 +5,14 @@
         <el-input v-model="dataForm.userName" placeholder="鐢ㄦ埛璐﹀彿" clearable></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">鏌ヨ</el-button>
+        <el-button @click="getDataList()" type="primary">鏌ヨ</el-button>
         <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">鏂板</el-button>
-        <el-button v-if="isAuth('sys:user:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">鎵归噺鍒犻櫎</el-button>
+        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
+                  >鐗规畩鏉冮檺
+        </el-button>
+        <el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
+                  >宸ュ巶鎺堟潈
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table
@@ -15,20 +20,22 @@
       border
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
+      highlight-current-row
+      @current-change="handleCurrentChange"
       style="width: 100%;">
-<!--      <el-table-column-->
-<!--        type="selection"-->
-<!--        header-align="center"-->
-<!--        align="center"-->
-<!--        width="50">-->
-<!--      </el-table-column>-->
-<!--      <el-table-column-->
-<!--        prop="userId"-->
-<!--        header-align="center"-->
-<!--        align="center"-->
-<!--        width="80"-->
-<!--        label="ID">-->
-<!--      </el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        type="selection"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="50">-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column-->
+      <!--        prop="userId"-->
+      <!--        header-align="center"-->
+      <!--        align="center"-->
+      <!--        width="80"-->
+      <!--        label="ID">-->
+      <!--      </el-table-column>-->
       <el-table-column
         prop="username"
         header-align="center"
@@ -59,7 +66,7 @@
         align="center"
         label="鐘舵��">
         <template slot-scope="scope">
-          <el-link v-if="scope.row.status === 0"  type="success">绂佺敤</el-link>
+          <el-link v-if="scope.row.status === 0" type="success">绂佺敤</el-link>
           <el-link v-else type="danger">姝ｅ父</el-link>
         </template>
       </el-table-column>
@@ -77,15 +84,16 @@
         width="150"
         label="鎿嶄綔">
         <template slot-scope="scope">
-          <a  type="text" size="small" @click="generateData(scope.row)">瀹℃牳</a>
-          <a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">淇敼</a>
+          <a type="text" size="small" @click="generateData(scope.row)">瀹℃牳</a>
+          <a v-if="isAuth('sys:user:update')" type="text" size="small"
+             @click="addOrUpdateHandle(scope.row.userId)">淇敼</a>
           <a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">鍒犻櫎</a>
         </template>
       </el-table-column>
     </el-table>
     <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
+      highlight-current-row
+      @current-change="handleCurrentChange"
       :current-page="pageIndex"
       :page-sizes="[20, 50, 100, 200,500]"
       :page-size="pageSize"
@@ -95,7 +103,8 @@
     <!-- 寮圭獥, 鏂板 / 淇敼 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
 
-    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputSearch1" :visible.sync="setUp.reviewFlag" width="560px">
+    <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag :title="inputSearch1"
+               :visible.sync="setUp.reviewFlag" width="560px">
       <template>
         <el-transfer v-model="checked" :data="transferData" :titles="['鎵�鏈夋潈闄�', '褰撳墠鏉冮檺']"></el-transfer>
       </template>
@@ -108,178 +117,185 @@
 </template>
 
 <script>
-  import AddOrUpdate from './user-add-or-update'
-  import {
-    getUserBusinessRoleList,
-    saveUserBusinessRole,
-  } from '@/api/auditManagement/auditType.js'
-  export default {
-    data () {
-      return {
-        currentData : {},
-        userId: this.$store.state.user.name,
-        transferData : [],
-        checked: [],
-        inputSearch1 : '瀹℃牳鏉冮檺',
-        //璁剧疆
-        setUp :{
-          reviewFlag : false,
-          saveButton : false,
-        },
-        dataForm: {
-          userName: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 20,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    activated () {
-      this.getDataList()
+import AddOrUpdate from './user-add-or-update'
+import {
+  getUserBusinessRoleList,
+  saveUserBusinessRole,
+} from '@/api/auditManagement/auditType.js'
+
+export default {
+  data() {
+    return {
+      showButton: true,
+      currentData: {},
+      userId: this.$store.state.user.name,
+      transferData: [],
+      checked: [],
+      inputSearch1: '瀹℃牳鏉冮檺',
+      //璁剧疆
+      setUp: {
+        reviewFlag: false,
+        saveButton: false,
+      },
+      dataForm: {
+        userName: ''
+      },
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      dataListLoading: false,
+      dataListSelections: [],
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated() {
+    this.getDataList()
+  },
+  methods: {
+    // 閫変腑琛�
+    handleCurrentChange() {
+      this.showButton = false
     },
-    methods: {
-      saveUserRoleFlag(){
-        let saveList = []
-        let currentList = this.checked
-        // 褰撳墠鏈�夋嫨璁板綍
-        if(currentList.length == 0){
-          this.$confirm("褰撳墠鏈�夋嫨璁板綍,鏄惁缁х画锛�", '鍒犻櫎鎻愮ず', {
-            confirmButtonText: '纭畾',
-            cancelButtonText: '鍙栨秷',
-          }).then(()=>{
-            let data = {
-              userId : this.currentData.userId,
-            }
-            saveList.push(data);
-            this.saveUserBusinessRole(saveList)
-          }).catch(()=>{
-            return
-          })
-        }else {
-          for (let i = 0; i < currentList.length; i++) {
-            let data = {
-              userId : this.currentData.userId,
-              roleItemNo : currentList[i],
-              selectFlag : 'Y',
-            }
-            saveList.push(data);
+    saveUserRoleFlag() {
+      let saveList = []
+      let currentList = this.checked
+      // 褰撳墠鏈�夋嫨璁板綍
+      if (currentList.length == 0) {
+        this.$confirm("褰撳墠鏈�夋嫨璁板綍,鏄惁缁х画锛�", '鍒犻櫎鎻愮ず', {
+          confirmButtonText: '纭畾',
+          cancelButtonText: '鍙栨秷',
+        }).then(() => {
+          let data = {
+            userId: this.currentData.userId,
           }
+          saveList.push(data);
           this.saveUserBusinessRole(saveList)
+        }).catch(() => {
+          return
+        })
+      } else {
+        for (let i = 0; i < currentList.length; i++) {
+          let data = {
+            userId: this.currentData.userId,
+            roleItemNo: currentList[i],
+            selectFlag: 'Y',
+          }
+          saveList.push(data);
         }
-      },
-      saveUserBusinessRole(saveList){
-        saveUserBusinessRole(saveList).then(({data}) =>{
-          this.$alert(data.msg, '鎿嶄綔鎻愮ず', {
-            confirmButtonText: '纭畾',
-            callback: action => {
-              if (data.code == 0) {
-                this.setUp.reviewFlag = false
-              }
-              this.setUp.saveButton = false
+        this.saveUserBusinessRole(saveList)
+      }
+    },
+    saveUserBusinessRole(saveList) {
+      saveUserBusinessRole(saveList).then(({data}) => {
+        this.$alert(data.msg, '鎿嶄綔鎻愮ず', {
+          confirmButtonText: '纭畾',
+          callback: action => {
+            if (data.code == 0) {
+              this.setUp.reviewFlag = false
             }
+            this.setUp.saveButton = false
+          }
+        });
+      })
+    },
+    generateData(row) {
+      this.currentData = row
+      let queryData = {
+        active: 'Y',
+        userId: this.currentData.userId,
+      }
+      getUserBusinessRoleList(queryData).then(({data}) => {
+        let rows1Data = data.map.rows1
+        let rows2Data = data.map.rows2
+        let forData = []
+        let checkedList = []
+        for (let i = 0; i < rows1Data.length; i++) {
+          forData.push({
+            key: rows1Data[i].roleItemNo,
+            label: rows1Data[i].roleDesc,
           });
-        })
-      },
-      generateData(row){
-        this.currentData = row
-        let queryData = {
-          active : 'Y',
-          userId : this.currentData.userId,
         }
-        getUserBusinessRoleList(queryData).then(({data}) =>{
-          let rows1Data = data.map.rows1
-          let rows2Data = data.map.rows2
-          let forData = []
-          let checkedList = []
-          for(let i = 0; i < rows1Data.length; i++) {
-            forData.push({
-              key: rows1Data[i].roleItemNo,
-              label: rows1Data[i].roleDesc,
-            });
-          }
-          for (let j = 0; j < rows2Data.length; j++) {
-            checkedList.push(rows2Data[j].roleItemNo)
-          }
-          this.transferData = forData;
-          this.checked = checkedList
-          this.setUp.reviewFlag = true
+        for (let j = 0; j < rows2Data.length; j++) {
+          checkedList.push(rows2Data[j].roleItemNo)
+        }
+        this.transferData = forData;
+        this.checked = checkedList
+        this.setUp.reviewFlag = true
+      })
+    },
+    // 鑾峰彇鏁版嵁鍒楄〃
+    getDataList() {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/sys/user/list'),
+        method: 'get',
+        params: this.$http.adornParams({
+          'page': this.pageIndex,
+          'limit': this.pageSize,
+          'username': this.dataForm.userName
         })
-      },
-      // 鑾峰彇鏁版嵁鍒楄〃
-      getDataList () {
-        this.dataListLoading = true
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.totalPage = data.page.totalCount
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
+    },
+    // 姣忛〉鏁�
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    // 褰撳墠椤�
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    // 澶氶��
+    selectionChangeHandle(val) {
+      this.dataListSelections = val
+    },
+    // 鏂板 / 淇敼
+    addOrUpdateHandle(id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
+    },
+    // 鍒犻櫎
+    deleteHandle(id) {
+      var userIds = id ? [id] : this.dataListSelections.map(item => {
+        return item.userId
+      })
+      this.$confirm(`纭畾瀵筟id=${userIds.join(',')}]杩涜[${id ? '鍒犻櫎' : '鎵归噺鍒犻櫎'}]鎿嶄綔?`, '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
         this.$http({
-          url: this.$http.adornUrl('/sys/user/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'username': this.dataForm.userName
-          })
+          url: this.$http.adornUrl('/sys/user/delete'),
+          method: 'post',
+          data: this.$http.adornData(userIds, false)
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.$message.success('鎿嶄綔鎴愬姛')
+            this.getDataList()
           } else {
-            this.dataList = []
-            this.totalPage = 0
+            this.$message.error(data.msg)
           }
-          this.dataListLoading = false
         })
-      },
-      // 姣忛〉鏁�
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 褰撳墠椤�
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 澶氶��
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 鏂板 / 淇敼
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 鍒犻櫎
-      deleteHandle (id) {
-        var userIds = id ? [id] : this.dataListSelections.map(item => {
-          return item.userId
-        })
-        this.$confirm(`纭畾瀵筟id=${userIds.join(',')}]杩涜[${id ? '鍒犻櫎' : '鎵归噺鍒犻櫎'}]鎿嶄綔?`, '鎻愮ず', {
-          confirmButtonText: '纭畾',
-          cancelButtonText: '鍙栨秷',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/sys/user/delete'),
-            method: 'post',
-            data: this.$http.adornData(userIds, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-               this.$message.success('鎿嶄綔鎴愬姛')
-              this.getDataList()
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      }
+      }).catch(() => {
+      })
     }
   }
+}
 </script>
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index f5889c6..4bd6cbc 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -273,6 +273,96 @@ export default {
         search: '鏌ヨ',
       },
       columnProduceScheduleArray: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceCostRollUpFlag',
+          tableId: "5302Produce",
+          tableName: "寰呯敓浜у伐鍗�",
+          columnProp: "costRollUpFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "宸叉帓鏂�",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceManualFlag',
+          tableId: "5302Produce",
+          tableName: "寰呯敓浜у伐鍗�",
+          columnProp: "manualFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "鍒�妯″凡鍙�",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProduceRepairSOFlag',
+          tableId: "5302Produce",
+          tableName: "寰呯敓浜у伐鍗�",
+          columnProp: "repairSOFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "鍗扮増宸插彂",
+          columnWidth: 60,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreResourceInfo',
+          tableId: "5302Produce",
+          tableName: "寰呯敓浜у伐鍗�",
+          columnProp: "preResourceInfo",
+          headerAlign: "center",
+          align: "left",
+          columnLabel: "涓婂伐搴忔満鍙颁俊鎭�",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5302,
+          serialNumber: '5302ProducePreQtyFinished',
+          tableId: "5302Produce",
+          tableName: "寰呯敓浜у伐鍗�",
+          columnProp: "preQtyFinished",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "涓婂伐搴忓畬宸ユ暟",
+          columnWidth: 100,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 5302,
@@ -286,7 +376,7 @@ export default {
           columnWidth: 125,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -304,7 +394,7 @@ export default {
           columnWidth: 125,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -373,10 +463,10 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "宸ュ簭鍙�",
-          columnWidth: 50,
+          columnWidth: 80,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -412,7 +502,7 @@ export default {
           columnWidth: 60,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -443,12 +533,12 @@ export default {
           tableName: "寰呯敓浜у伐鍗�",
           columnProp: "qtyReported",
           headerAlign: "center",
-          align: "center",
+          align: "right",
           columnLabel: "宸叉姤鍛婃暟閲�",
-          columnWidth: 70,
+          columnWidth: 100,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -463,10 +553,10 @@ export default {
           headerAlign: "center",
           align: "center",
           columnLabel: "鐢熶骇璁㈠崟瑕佹眰瀹屽伐鏃ユ湡",
-          columnWidth: 130,
+          columnWidth: 170,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -502,7 +592,7 @@ export default {
           columnWidth: 110,
           columnHidden: false,
           columnImage: false,
-          columnSortable: false,
+          columnSortable: true,
           sortLv: 0,
           status: true,
           fixed: false
@@ -993,96 +1083,7 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProduceCostRollUpFlag',
-          tableId: "5302Produce",
-          tableName: "寰呯敓浜у伐鍗�",
-          columnProp: "costRollUpFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "宸叉帓鏂�",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProduceManualFlag',
-          tableId: "5302Produce",
-          tableName: "寰呯敓浜у伐鍗�",
-          columnProp: "manualFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "鍒�妯″凡鍙�",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProduceRepairSOFlag',
-          tableId: "5302Produce",
-          tableName: "寰呯敓浜у伐鍗�",
-          columnProp: "repairSOFlag",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "鍗扮増宸插彂",
-          columnWidth: 80,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProducePreResourceInfo',
-          tableId: "5302Produce",
-          tableName: "寰呯敓浜у伐鍗�",
-          columnProp: "preResourceInfo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "涓婂伐搴忔満鍙颁俊鎭�",
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5302,
-          serialNumber: '5302ProducePreQtyFinished',
-          tableId: "5302Produce",
-          tableName: "寰呯敓浜у伐鍗�",
-          columnProp: "preQtyFinished",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "涓婂伐搴忓畬宸ユ暟",
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
-        },
+
       ],
       menuButton: {
         prdButton: true,
@@ -1456,7 +1457,7 @@ export default {
       // 鍙栨秷鎵�鏈夋淳宸ュ崟鎿嶄綔
       if ('6' == val) {
         //璋冪敤鎻愮ず鐨勬柟娉�
-        this.$confirm(` 纭畾鍙栨秷鎵�鏈夋淳宸ュ崟鎿嶄綔`, `鐢熶骇宸叉帓鏂檂, {
+        this.$confirm(` 纭畾鍙栨秷鎵�鏈夋淳宸ュ崟鎿嶄綔`, `鐢熶骇璁㈠崟`, {
           confirmButtonText: '纭畾',
           cancelButtonText: '鍙栨秷',
           type: 'warning'