按钮限制

src/views/supply/apply/apply_list.vue

@@ -7,10 +7,12 @@
           <template #left_btn>
             <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
-              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                  item.label
-                }}
-              </el-radio-button>
+              <template v-for="(item, index) in statusList">
+                <el-radio-button v-if="index !== 3" :key="index" :label="item.value">{{
+                    item.label
+                  }}
+                </el-radio-button>
+              </template>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -47,7 +49,6 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
-                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -391,8 +392,13 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'SAVE'
+                    (( !isCustomer && !scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL'))||(isCustomer && !scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') && scope.row.type!=2) || (
+                    !isCustomer  &&  scope.row.automaticStatus &&
+                     (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') &&
+                     scope.row.type===2
+                    ) )
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -403,8 +409,10 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type!=2)||( !isCustomer  && scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -415,8 +423,10 @@
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'OK'
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK')||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type!=2)||( !isCustomer && scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -438,14 +448,15 @@
                 </el-button>
                 <el-button
                   v-if="
-                    ($checkBtnRole('edit', $route.meta.roles) &&
-                      !scope.row.automaticStatus &&
+                    $checkBtnRole('edit', $route.meta.roles) &&
+                      ((!isCustomer && !scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2) ||
-                    ($checkBtnRole('edit', $route.meta.roles) &&
-                      scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                      scope.row.type === 2)||(isCustomer && !scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type!=2 && scope.row.type !==1)  ||
+                      ( !isCustomer && scope.row.automaticStatus &&
+                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                     scope.row.type===2)
+                      )
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -455,20 +466,23 @@
                 <el-button
                   v-if="
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus === 'WAIT'
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'WAIT' && scope.row.type!=2) || (!isCustomer && scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
-                  审单
+                  审核
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('del', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    scope.row.examineStatus !== 'OK'
+                    ((!isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK' ) ||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK' && scope.row.type!=2)   || ( !isCustomer &&scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )
                   "
                   style="margin-left: 10px"
                   title="确定删除吗？"
@@ -557,14 +571,13 @@ export default {
         serviceId: '',
         categoryId: '',
         approvalName: '',
-        createBy: '',
-        automaticStatus: ''
+        createBy: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        //  // { label: '审核驳回', value: 'FAIL' },,
+        { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' }
       ],
       orderTypeList: [
@@ -587,7 +600,9 @@ export default {
         status: '',
         remark: ''
       },
-      categoryList: []
+      categoryList: [],
+      isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer
+
     }
   },
 
@@ -609,8 +624,7 @@ export default {
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
         categoryId: this.screenForm.categoryId,
-        approvalName: this.screenForm.approvalName,
-        automaticStatus: this.screenForm.automaticStatus
+        approvalName: this.screenForm.approvalName
       }
     }
   },
@@ -675,7 +689,6 @@ export default {
         correspondName: this.screenForm.warehouse,
         customerNumber: this.screenForm.jxsNum,
         createBy: this.screenForm.createBy,
-        automaticStatus: this.screenForm.automaticStatus,
 
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
@@ -815,7 +828,7 @@ export default {
       ids = Array.from(new Set(ids))
       examineBatchApply({
         ids: ids.join(','),
-        examineStatus: this.examineForm.status,
+        examineStatus: this.examineForm.status === 'FAIL' ? 'SAVE' : 'OK',
         approvalRemark: this.examineForm.remark
       }).then(res => {
         this.isShowExamineDialog = false

src/views/supply/apply/engin_list.vue

@@ -7,10 +7,13 @@
           <template #left_btn>
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
-              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                  item.label
-                }}
-              </el-radio-button>
+              <template v-for="(item, index) in statusList" >
+                <el-radio-button v-if="index !== 3" :key="index" :label="item.value">{{
+                    item.label
+                  }}
+                </el-radio-button>
+              </template>
+
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -47,7 +50,6 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
-                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -85,8 +87,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
-                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程信息单号" />
+                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录编号" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -259,7 +261,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程信息单号"
+              label="工程登录编号"
               prop="refEnginRecordNo"
               min-width="200"
               show-overflow-tooltip
@@ -420,9 +422,14 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
                     $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'SAVE'
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL'))||(isCustomer && !scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') && scope.row.type!=2)  || (
+                     !isCustomer  && scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE'|| scope.row.examineStatus === 'FAIL') &&
+                     scope.row.type===2
+                    ) )
                   "
                   style="margin-right: 10px"
                   title="确定申请吗？"
@@ -432,9 +439,11 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('apply', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                  $checkBtnRole('apply', $route.meta.roles) &&
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT') ||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type!=2) ||(!isCustomer  && scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT'&& scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定撤回吗？"
@@ -444,9 +453,11 @@
                 </el-popconfirm>
                 <el-popconfirm
                   v-if="
-                    !scope.row.automaticStatus &&
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'OK'
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK')||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type!=2) ||( !isCustomer  && scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type==2))
                   "
                   style="margin-right: 10px"
                   title="确定弃审吗？"
@@ -456,7 +467,7 @@
                 </el-popconfirm>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus &&
+                     !scope.row.automaticStatus &&
                     $checkBtnRole('edit', $route.meta.roles) &&
                     (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
                     scope.row.type === 1
@@ -468,14 +479,14 @@
                 </el-button>
                 <el-button
                   v-if="
-                    (!scope.row.automaticStatus &&
-                      $checkBtnRole('edit', $route.meta.roles) &&
+                  $checkBtnRole('edit', $route.meta.roles) &&
+                    (( !isCustomer &&!scope.row.automaticStatus &&
                       (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                      scope.row.type === 2) ||
-                    ($checkBtnRole('edit', $route.meta.roles) &&
-                      scope.row.automaticStatus &&
-                      scope.row.examineStatus === 'SAVE' &&
-                      scope.row.type == 2)
+                      scope.row.type === 2 )||(isCustomer && !scope.row.automaticStatus &&
+                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') && scope.row.type!=2 && scope.type!==1) ||
+                       (!isCustomer  &&scope.row.automaticStatus &&
+                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                     scope.row.type===2))
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"
@@ -484,19 +495,24 @@
                 </el-button>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus &&
                     $checkBtnRole('examine', $route.meta.roles) &&
-                    scope.row.examineStatus === 'WAIT'
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT')||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type!=2)|| ( !isCustomer  &&scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'WAIT' && scope.row.type==2))
                   "
                   type="text"
                   @click="toExamine(scope.row)"
                 >
-                  审单
+                  审核
                 </el-button>
                 <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <!--             !scope.row.automaticStatus &&  -->
                 <el-popconfirm
-                  v-if="!scope.row.automaticStatus && scope.row.examineStatus !== 'OK'"
+                  v-if="  $checkBtnRole('del', $route.meta.roles) &&
+                    ((!isCustomer &&!scope.row.automaticStatus &&
+                    scope.row.examineStatus !== 'OK')||(isCustomer && !scope.row.automaticStatus &&
+                    scope.row.examineStatus === 'OK' && scope.row.type!=2) || ( !isCustomer  && scope.row.automaticStatus && scope.row.examineStatus !== 'OK' && scope.row.type==2 ) )"
                   style="margin-left: 10px"
                   title="确定删除吗？"
                   @onConfirm="handleDelete(scope.row.id)"
@@ -592,7 +608,7 @@ export default {
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
         { label: '审核通过', value: 'OK' },
-        //  // { label: '审核驳回', value: 'FAIL' },,
+        { label: '审核驳回', value: 'FAIL' },
         { label: '已关闭', value: 'CLOSE' }
       ],
       orderTypeList: [
@@ -616,7 +632,9 @@ export default {
         remark: ''
       },
       isShow: false,
-      categoryList: []
+      categoryList: [],
+      isCustomer: JSON.parse(localStorage.getItem('supply_user')).isCustomer,
+
     }
   },
 
@@ -633,7 +651,6 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
-        automaticStatus: this.screenForm.automaticStatus,
         k3ServiceId: this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
@@ -706,7 +723,6 @@ export default {
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
-        automaticStatus: this.screenForm.automaticStatus,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
@@ -844,9 +860,10 @@ export default {
         return item.id
       })
       ids = Array.from(new Set(ids))
+
       examineBatchEngin({
         ids: ids.join(','),
-        examineStatus: this.examineForm.status,
+        examineStatus: this.examineForm.status === 'FAIL' ? 'SAVE' : 'OK',
         approvalRemark: this.examineForm.remark
       }).then(res => {
         this.isShowExamineDialog = false