Merge remote-tracking branch 'origin/project1' into project1

src/views/equipment/application.vue

@@ -10,14 +10,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="phd" style="flex-basis: 50%;" prop="phd">
-            <el-input   ref="input2" v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
+            <el-input ref="input2" v-model="form.phd" placeholder="请输入phd" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(2,$event)" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 16%;">
           <el-form-item label="prank" style="flex-basis: 50%;" prop="prank">
-            <el-input  ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
+            <el-input ref="input3" v-model="form.prank" placeholder="请输入prank" :style="{ width: '400px', height: '30px' }" :maxlength="10" @keyup.enter.native="handelTab(3,$event)" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -74,11 +74,6 @@ import { getDictData, addApplication } from '@/api/equipment/application'
 
 export default {
   name: 'Role',
-  mounted() {
-    this.$nextTick(() => {
-      this.$refs.input1.$refs.input.focus()
-    })
-  },
   data() {
     return {
       form: {
@@ -90,8 +85,8 @@ export default {
       },
       rule: {
         pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
-        phd: [{ required: true,pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
-        prank: [{ required: true,pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
+        phd: [{ required: true, pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
+        prank: [{ required: true, pattern: /^\d+$/, message: '仅能输入整数', trigger: 'blur' }],
         pgx: [{ required: true, message: '请输入pgx', trigger: 'blur' }],
         pissb: [{ required: true, message: '请输入pissb', trigger: 'blur' }],
         pnumber: [{ required: true, message: '请输入pnumber', trigger: 'blur' }]
@@ -109,6 +104,11 @@ export default {
       ]
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs.input1.$refs.input.focus()
+    })
+  },
   created() {
     this.init()
   },

src/views/equipment/basicInfo.vue

@@ -415,36 +415,7 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type === 'menu') {
-        this.form.menuCheckStrictly = !!value
-      } else if (type === 'dept') {
-        this.form.deptCheckStrictly = !!value
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type === 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : [])
-      } else if (type === 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions : [])
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type === 'menu') {
-        const treeList = this.menuOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value
-        }
-      } else if (type === 'dept') {
-        const treeList = this.deptOptions
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value
-        }
-      }
-    },
+
     /** 新增按钮操作 */
     handleAdd() {
       this.open = true

src/views/equipment/boundManagement.vue

@@ -99,7 +99,7 @@
 
     <!-- 添加或修改设备配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="pn" prop="pn">
           <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
         </el-form-item>

src/views/equipment/checkProcess.vue

@@ -149,7 +149,7 @@
       </div>
     </el-dialog>
     <!-- 弹出框。。。。。。。。。。。。。。。。。。。。。。。 -->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal= "false">
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">
@@ -216,7 +216,7 @@
       :visible.sync="table"
       direction="rtl"
       size="50%"
-      :close-on-click-modal= "false"
+      :close-on-click-modal="false"
     >
       <el-table v-loading="loading" border :data="tableList" style="padding: 0 10px;" @selection-change="handleSelectionChange">
 
@@ -377,10 +377,9 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        rows: 10,  
+        rows: 10,
         ptype: 2,
-        pstatus:0,
-        
+        pstatus: 0
 
       },
       // 表单参数
@@ -666,7 +665,7 @@ export default {
         page: 1,
         rows: 10,
         ptype: 2,
-        pstatus:0
+        pstatus: 0
       }
       this.resetForm('queryForm')
       this.handleQuery()

src/views/equipment/management.vue

@@ -53,7 +53,7 @@
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备管理列表</div>
-      <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange" >
+      <el-table v-loading="loading" border :data="equipmentList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="80" />
         <el-table-column label="pn" prop="businessId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
@@ -80,7 +80,7 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate" >
+        <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="updateDate">
           <template slot-scope="scope">
             <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
@@ -116,9 +116,9 @@
 
     <!-- 添加或修改设备配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px" >
+      <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
         <el-form-item label="pn" prop="pn">
-          <el-input ref="input1" v-model.trim="form.pn" :maxlength="30" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
+          <el-input ref="input1" v-model.trim="form.pn" :maxlength="100" placeholder="请输入pn" @keyup.enter.native="handelTab(1,$event)" />
         </el-form-item>
         <el-form-item label="lot" prop="lot">
           <el-input ref="input2" v-model.trim="form.lot" :maxlength="30" placeholder="请输入lot" @keyup.enter.native="handelTab(2,$event)" />

src/views/equipment/processEquipment.vue

@@ -141,8 +141,8 @@ import {
   listRole,
   updateRole
 } from '@/api/system/role'
-import {roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect} from '@/api/system/menu'
-import {roleDeptTreeselect, treeselect as deptTreeselect} from '@/api/system/dept'
+import { roleMenuTreeselect, roleMenuTreeselectMC, treeselect as menuTreeselect } from '@/api/system/menu'
+import { roleDeptTreeselect, treeselect as deptTreeselect } from '@/api/system/dept'
 // import { getRolesByInsId } from '../../../api/businessManage/template'
 export default {
   name: 'Role',

src/views/processManagement/deviceReuse/index.vue

 <template>
   <div class="app-container">
-<!--    表单区域-->
-      <el-form ref="form" :model="form" :rules="rule" label-width="80px">
-<!--      标题-->
+    <!--    表单区域-->
+    <el-form ref="form" :model="form" :rules="rule" label-width="80px">
+      <!--      标题-->
       <div class="info"><span class="title">再利用</span></div>
       <el-row :gutter="40">
         <el-col :span="12" style="padding-left: 10%;">

src/views/processManagement/draw.vue

@@ -337,7 +337,17 @@
       </div>
     </el-dialog>
 
-    <!--    登录验证-->
+    <el-dialog title="菜单权限" :visible.sync="menu" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="menuform" label-width="80px">
+        <el-form-item label="密码">
+          <el-input v-model="menuform.passWord" type="password" placeholder="请输入权限菜单密码" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handlemenuConfirm">确定</el-button>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+    <!--    菜单权限验证-->
     <el-dialog :title="title" :visible.sync="openLogin" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="loginform" label-width="80px">
         <el-form-item label="密码">
@@ -358,6 +368,11 @@ export default {
   name: 'Draw',
   data() {
     return {
+      menu: false,
+      menuform: {
+
+      },
+      monthDate: false,
       // 是否切换库
       isCheck: false,
       loginform: {
@@ -465,10 +480,6 @@ export default {
       },
       // 表单参数
       form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
       deptOptions: [],
       // 判断状态显示表单
       applyStatus: ''
@@ -488,6 +499,40 @@ export default {
     this.getList()
   },
   methods: {
+    handlemenuConfirm() {
+      const obj = {
+        passWord: this.menuform.passWord
+      }
+      checkPermission(obj).then(res => {
+        if (res.code === 200) {
+          batchAddition(this.canceList).then(res => {
+            if (res.code === 200) {
+              this.loadingDetail = false
+              this.openHandle = false
+              this.radio1 = '2'
+              this.isCheck = false
+              this.$message.success('操作成功')
+              this.queryParams.page = 1
+              this.getList()
+            }
+          })
+          this.menuform.password = ''
+        } else if (res.code === null) {
+          this.$message.warning(res.message)
+          this.loadingDetail = false
+          this.multipleSelection = false
+          this.monthDate = false
+          this.menu = false
+        }
+      })
+    },
+    // 判断时间范围 是否是一个月以内的的时间
+    isWithinLastMonth(dateToCheck) {
+      var currentDate = new Date() // 当前日期对象
+      var oneMonthAgo = new Date() // 一个月前的日期对象
+      oneMonthAgo.setMonth(currentDate.getMonth() - 1) // 将一个月前的日期设置为当前月份减1
+      return dateToCheck >= oneMonthAgo && dateToCheck <= currentDate
+    },
     handlecanceClose() {
       this.loadingDetail = false
       this.openHandle = false
@@ -544,6 +589,7 @@ export default {
               if (res.data.createDate !== null) {
                 res.data.createDate = parseTime(res.data.createDate, '{y}-{m}-{d}')
               }
+              this.loginform.password = ''
               this.detailApplyList = res.data
               this.loadingDetail = false
               this.openHandle = true
@@ -576,6 +622,7 @@ export default {
       })
     },
 
+    // 处理弹窗里的勾选确定
     handleCance() {
       this.loadingDetail = true
       if (this.multipleSelection.length === 0) {
@@ -584,6 +631,10 @@ export default {
         this.canceList = []
         this.multipleSelection.forEach(item => {
           console.log('item', item)
+          if (!this.isWithinLastMonth(new Date(item.recycleDate))) {
+            this.monthDate = true
+            this.openHandle = false
+          }
           const obj = {
             applyId: this.applyId,
             pn: item.pn,
@@ -597,19 +648,26 @@ export default {
           this.canceList.push(obj)
         })
         console.log('canceList', this.canceList)
-        batchAddition(this.canceList).then(res => {
-          if (res.code === 200) {
-            this.loadingDetail = false
-            this.openHandle = false
-            this.radio1 = '2'
-            this.isCheck = false
-            this.$message.success('操作成功')
-            this.queryParams.page = 1
-            this.getList()
-          }
-        })
+        console.log('monthDate', this.monthDate)
+        if (this.monthDate) {
+          this.menu = true
+        }
+        if (!this.monthDate) {
+          batchAddition(this.canceList).then(res => {
+            if (res.code === 200) {
+              this.loadingDetail = false
+              this.openHandle = false
+              this.radio1 = '2'
+              this.isCheck = false
+              this.$message.success('操作成功')
+              this.queryParams.page = 1
+              this.getList()
+            }
+          })
+        }
       }
     },
+
     /** 查询warehouse列表 */
     getDeviceList() {
       this.loadingDetail = true
@@ -641,8 +699,12 @@ export default {
         this.handcheckPermissionQuery()
       }
     },
+
+    // 处理点击
     handle(row) {
       console.log('row', row)
+      this.monthDate = false
+      this.openHandle = true
       this.applyId = row.businessId
       this.pn = row.pn
       this.ptype = row.ptype
@@ -659,6 +721,7 @@ export default {
         page: this.queryParamsDetail.page,
         rows: this.queryParamsDetail.rows
       }
+      // 调warehouse分页查询接口
       getEquipment(obj).then(res => {
         if (res.code === 200) {
           if (res.data.createDate !== null) {
@@ -672,7 +735,8 @@ export default {
       this.title = '处理'
       this.loadingDetail = true
     },
-    // 获取所选行详情信息
+
+    // 获取行详情信息
     handleDetail(row) {
       const id = row.businessId
       this.openDetails = true
@@ -685,7 +749,8 @@ export default {
         this.loadingDetail = false
       })
     },
-    /** 查询apply列表 */
+
+    // 查询apply表单
     getList() {
       this.isCheck = false
       this.radio1 = '2'

src/views/processManagement/equipmentRequisition/index.vue

@@ -434,8 +434,7 @@ export default {
           }
         }
       })
-    },
-
+    }
 
   }
 }

src/views/sample/basicInformation/index.vue

@@ -172,7 +172,7 @@ export default {
       rules: {
         pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
         name: [{ required: true, message: '请输入name', trigger: 'blur' }],
-        qty: [{ required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        qty: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
         maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
         minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
       },

src/views/sample/correctionLibrary/index.vue

@@ -154,7 +154,7 @@ export default {
       rules: {
         pn: [{ required: true, message: '请输入pn', trigger: 'blur' }],
         name: [{ required: true, message: '请输入name', trigger: 'blur' }],
-        qty: [{  required: true,pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
+        qty: [{ required: true, pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
         maxQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }],
         minQty: [{ pattern: /^[0-9]{1,9}(\.[0-9]{1,3})?$/, message: '仅能输入数字和小数,限制三位小数', trigger: 'change' }]
       },

src/views/sample/sampleType/index.vue

@@ -46,13 +46,13 @@
             icon="el-icon-plus"
             @click="handleAdd"
           >新增</el-button>
-<!--          <el-button-->
-<!--            style="padding: 8px 7px;"-->
-<!--            type="success"-->
-<!--            size="small"-->
-<!--            icon="el-icon-download"-->
-<!--            @click="handleExport"-->
-<!--          >导出</el-button>-->
+          <!--          <el-button-->
+          <!--            style="padding: 8px 7px;"-->
+          <!--            type="success"-->
+          <!--            size="small"-->
+          <!--            icon="el-icon-download"-->
+          <!--            @click="handleExport"-->
+          <!--          >导出</el-button>-->
         </el-form-item>
       </div>
     </el-form>
@@ -78,11 +78,11 @@
             {{ scope.row.dno || '-' }}
           </template>
         </el-table-column>
-<!--        <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
-<!--          <template slot-scope="scope">-->
-<!--            {{ scope.row.remarks || '-' }}-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="remarks" prop="remarks" :show-overflow-tooltip="true">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.remarks || '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="操作人" prop="createName" :show-overflow-tooltip="true" width="200px">
           <template slot-scope="scope">
             {{ scope.row.createName || '-' }}
@@ -138,9 +138,9 @@
         <el-form-item label="dno" prop="dno">
           <el-input v-model.trim="form.dno" clearable :maxlength="100" placeholder="请输入dno" />
         </el-form-item>
-<!--        <el-form-item label="remarks" prop="remarks">-->
-<!--          <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="remarks" prop="remarks">-->
+        <!--          <el-input v-model.trim="form.remarks" :maxlength="30" placeholder="请输入remarks" />-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>