修改项目Bug

src/const/capital/productclass.js

@@ -1,47 +1,44 @@
 const num = (rule, value, callback) => {
   if (value < 0) {
-		callback(new Error('必须大于0'));
-		return false
+    callback(new Error("必须大于0"));
+    return false;
   }
   callback();
 };
-const statisticsTypeDic =
-[
+const statisticsTypeDic = [
   {
-		label: '否',
-		value: 0
+    label: "否",
+    value: 0,
   },
   {
-		label: '是',
-		value: 1
+    label: "是",
+    value: 1,
   },
-]
-	const gType =
-	[
+];
+const gType = [
   {
-			label: '启用',
-			value: 0
-		}, {
-			label: '禁用',
-			value: 1
-		}
-	]
-		const Type =
-		[
-			{
-				label:'固定资产',
-				value:1
+    label: "启用",
+    value: 0,
   },
   {
-				label:'试剂类',
-				value:2
+    label: "禁用",
+    value: 1,
   },
+];
+const Type = [
   {
-				label:'耗材类',
-				value:3
-			}
-		]
-
+    label: "固定资产",
+    value: 1,
+  },
+  // {
+  // 	label:'试剂类',
+  // 	value:2
+  // },
+  // {
+  // 	label:'耗材类',
+  // 	value:3
+  // }
+];
 
 export const tableOption = {
   calcHeight: 210,
@@ -66,38 +63,36 @@ export const tableOption = {
   selection: false,
   tip: false,
   tree: true,
-  searchBtn:false,
- emptyBtn:false,
+  searchBtn: false,
+  emptyBtn: false,
   slot: true,
   //弹框
-	saveBtn:false,
-  cancelBtn:false,
+  saveBtn: false,
+  cancelBtn: false,
   dialogWidth: 920,
-  addBtn:false,
-  updateBtn:false,
+  addBtn: false,
+  updateBtn: false,
   tip: false,
   labelPosition: "top",
   columnBtn: false,
   refreshBtn: false,
-  dialogCustomClass:"custom",
-  addTitle:"新增",
-	menuHeaderAlign: 'left',
-	column:
-	[
+  dialogCustomClass: "custom",
+  addTitle: "新增",
+  menuHeaderAlign: "left",
+  column: [
     {
       label: "类型",
       prop: "name",
       searchLabelWidth: 60,
       span: 8,
-			rules:
-			[
+      rules: [
         {
           required: true,
           message: "请输入类型名称",
-					trigger: "blur"
-				}
+          trigger: "blur",
+        },
       ],
-			overHidden:true,
+      overHidden: true,
     },
     {
       label: "资产类型",
@@ -106,15 +101,14 @@ export const tableOption = {
       span: 8,
       dicData: Type,
       editDisabled: true,
-			rules:
-			[
+      rules: [
         {
           required: true,
           message: "请选择资产类型",
           trigger: "blur",
-				}
+        },
       ],
-			overHidden:true,
+      overHidden: true,
     },
     {
       label: "上级类型",
@@ -125,18 +119,16 @@ export const tableOption = {
       addDisabled: false,
       span: 8,
       props: {
-			label: "title"
+        label: "title",
       },
-			rules:
-			[
+      rules: [
         {
           required: false,
           message: "上级类型",
-					trigger: "click"
-				}
+          trigger: "click",
+        },
       ],
-			overHidden:true,
-
+      overHidden: true,
     },
     {
       label: "状态",
@@ -144,23 +136,22 @@ export const tableOption = {
       type: "select",
       span: 8,
       dicData: gType,
-			overHidden:true,
-			rules:
-			[
+      overHidden: true,
+      rules: [
         {
           required: true,
           message: "请选择固定资产",
           trigger: "blur",
-				}
+        },
       ],
       // value: 1,
-			slot:true,
+      slot: true,
     },
     {
       label: "危险品",
       prop: "danger",
       type: "switch",
-			overHidden:true,
+      overHidden: true,
       span: 8,
       dicData: statisticsTypeDic,
     },
@@ -168,16 +159,18 @@ export const tableOption = {
       label: "排序",
       prop: "sort",
       type: "number",
-			overHidden:true,
+      overHidden: true,
       span: 8,
       width: 100,
       cell: true,
       // minRows: 1,
-			rules: [{
+      rules: [
+        {
           required: true,
           message: "请输入排序",
-					trigger: "blur"
-				}],
+          trigger: "blur",
+        },
+      ],
     },
-	]
-}
+  ],
+};

src/views/capital/productstoreList.vue

@@ -244,6 +244,7 @@
                 class="menuLeft"
                 size="small"
                 style="float: right"
+                v-if="permission.goods_list_check_btn"
                 @click="goodsconfirm"
                 >&ensp;物品确认</el-button
               >
@@ -549,8 +550,8 @@
             />
           </div>
           <div class="goodnumsc" style="width: 240px; margin-right: 20px">
-            <!-- <span class="choice" @click="choiceBatch(item, 1)">选择批次</span> -->
-            <span>申领数:&emsp;&emsp;&emsp;</span>
+            <span class="choice" @click="choiceBatch(item, 1)">选择批次</span>
+            <!-- <span>申领数:&emsp;&emsp;&emsp;</span> -->
             <el-input
               v-model="item.applyNum"
               placeholder="请输入申领数"

src/views/limsConfig/equipmentManage.vue

@@ -58,6 +58,7 @@
         type="primary"
         style="float: right; margin-right: 20px"
         @click="confirmDevice"
+        v-if="permission.Instrument_equipment_check"
         >设备确认</el-button
       >
     </SearchHeader>
@@ -109,7 +110,7 @@
           @click="scrapHandle(row, index)"
           >报废</el-button
         >
-        <el-button
+        <!-- <el-button
           class="look"
           size="small"
           v-if="
@@ -119,7 +120,7 @@
           "
           @click="routerToInspection(row)"
           >校准</el-button
-        >
+        > -->
         <el-button
           v-if="permission.Instrument_equipment_delete"
           class="look"

src/views/purchasing/checkList.vue

@@ -542,7 +542,7 @@ export default {
   
 }
 .file_box{
-  background: red;
+  // background: red;
 }
   
 </style>

src/views/purchasing/purchaseApply.vue

@@ -387,7 +387,7 @@
             </el-form-item> -->
               <el-form-item label="供应商" prop="supplierId">
                 <el-select
-                  :readonly="
+                  :disabled="
                     (dialogType == 'view' && addForm.applyStatus != 0) ||
                     (dialogType == 'examine' && addForm.applyStatus == 1)
                   "
@@ -489,7 +489,7 @@
             <el-table-column width="57px">
               <template slot="header">
                 <el-button
-                  :readonly="
+                  :disabled="
                     (dialogType == 'view' && addForm.applyStatus != 0) ||
                     (dialogType == 'examine' && addForm.applyStatus == 1)
                   "
@@ -502,7 +502,7 @@
               </template>
               <template slot-scope="scope">
                 <el-button
-                  :readonly="
+                  :disabled="
                     (dialogType == 'view' && addForm.applyStatus != 0) ||
                     (dialogType == 'examine' && addForm.applyStatus == 1)
                   "
@@ -632,7 +632,7 @@
             <el-row :gutter="20">
               <el-col style="width: 90%; margin-left: 1%">
                 <p style="font-size: 14px; color: #606266">审批意见</p>
-                <el-select v-model="examineValue" :readonly="(addForm.applyStatus == 2 || addForm.applyStatus == 3 || addForm.applyStatus == 4) && dialogType == 'view'">
+                <el-select v-model="addForm.status" :readonly="(addForm.applyStatus == 2 || addForm.applyStatus == 3 || addForm.applyStatus == 4) && dialogType == 'view'">
                   <el-option v-for="item in examineList" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </el-col>
@@ -641,7 +641,7 @@
       </div>
 
       <span slot="footer" class="dialog-footer">
-        <el-button v-show="(dialogType == 'view' && addForm.applyStatus != 1 &&  addForm.applyStatus != 2 && addForm.applyStatus != 3 && addForm.applyStatus != 4) || (dialogType == 'examine' && addForm.applyStatus == 1)" @click="handleSubmit()"
+        <el-button v-show="(dialogType == 'view' && addForm.applyStatus != 1 &&  addForm.applyStatus != 2 && addForm.applyStatus != 3 && addForm.applyStatus != 4) || (dialogType == 'examine' && addForm.applyStatus == 1) || dialogType == 'add'" @click="handleSubmit()"
           >提 交 </el-button
         >
         <el-button
@@ -953,6 +953,7 @@ export default {
       getDetail({ id: row.id }).then((res) => {
         this.addForm = res.data.data;
         this.examineValue = ''
+        this.addForm.status = ''
         this.goodsList = this.addForm.orderList;
         this.dialogInputVisible = true;
       });
@@ -965,6 +966,7 @@ export default {
         this.addForm = res.data.data;
         this.goodsList = this.addForm.orderList;
         this.examineValue = this.addForm.applyStatus
+        this.addForm.status = this.addForm.status + ''
         this.dialogInputVisible = true;
         if (this.addForm.applyStatus == 0) {
           this.isSave = true;
@@ -991,6 +993,7 @@ export default {
     },
     // 验收申请数据
     handleCheck(row) {
+      console.log('row ====>',row)
       this.fileList = []
       this.filesList = []
       this.dialogcheckVisible = true;
@@ -998,7 +1001,10 @@ export default {
         this.$refs.checkForm.clearValidate()
         this.checkForm = {
           applyId : row.id,
-          checkUserName :  this.userInfo.real_name
+          name:row.name,
+          supplierId:row.supplierId,
+          checkUserName :  this.userInfo.real_name,
+          receiveDate:row.expectedArrivalDate
         }
         console.log('check ==============>',this.checkForm)
       })
@@ -1099,10 +1105,10 @@ export default {
             }
           }else if(this.dialogType == 'examine'){
             console.log('examine ==================>')
-            if(this.examineValue == ''){
+            if(this.addForm.status == ''){
               this.$message.error('请填写审批意见')
             }else{
-              this.addForm.applyStatus = this.examineValue;
+              this.addForm.applyStatus = this.addForm.status;
               savePurchase(this.addForm).then((res) => {
                 console.log("add ===========>", res);
                 if (res.data.code == 200) {

src/views/repair/repairAppyDetail.vue

@@ -181,7 +181,7 @@
                 "
               >
               </span
-              >&ensp;<b>报修单审核</b> {{status}} {{viewType}}
+              >&ensp;<b>报修单审核</b>
             </h1>
           </div>
           <el-row>