duanxiaoduan 1 жил өмнө
parent
commit
2acf22cd0b

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
dist/index.html


+ 66 - 48
src/views/custom/subscribe/index.vue

@@ -15,14 +15,14 @@
       <el-select v-model="getdataListParm.parammaps.departmentId" clearable style="width: 140px;" placeholder="申购部门" class="filter-item">
         <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-select v-model="getdataListParm.parammaps.purchase_type" clearable style="width: 140px;" placeholder="申购状态" class="filter-item">
+      <el-select v-model="getdataListParm.parammaps.purchase_type" clearable style="width: 140px;" placeholder="申购类型" class="filter-item">
         <el-option v-for="item in subscriptionStatusList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-input v-model="getdataListParm.parammaps.empName" placeholder="申购人" style="width: 200px;" class="filter-item" />
       <!-- <el-select v-model="getdataListParm.parammaps.empName " style="width: 140px;" placeholder="申购人" class="filter-item">
         <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
       </el-select> -->
-      <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
+      <el-date-picker ref="inputDatetime" v-model="getdataListParm.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 270px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
 
@@ -71,7 +71,7 @@
         </template>
       </el-table-column>
       <el-table-column label="申购日期" sortable prop="inputTime" min-width="80px" align="center" />
-      <el-table-column label="申购状态" min-width="80px" align="center">
+      <el-table-column label="申购类型" min-width="80px" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.purchase_type == 1">暂估申购</span>
           <span v-else-if="scope.row.purchase_type == 3">赠品申购</span>
@@ -86,32 +86,32 @@
           <el-button v-if="row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 10||row.statue == 12 ||row.statue == 14" style="display:inline-block" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button v-else style="display:none" type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <!-- 库管 -->
-          <el-button v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName == '挤奶处'" style="display:inline-block" type="success" size="mini" @click="handleExamine1(row)">库管</el-button>
+          <el-button v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName == '挤奶处'" style="display:inline-block" type="success" size="mini" @click="handleExamine1(row)">审核</el-button>
           <el-button  v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="form_edit1(row)">合单</el-button>
           <el-button v-if="isSubscribeExamineKG && row.statue == 2 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="form_modify1(row)">提交</el-button>
 
           <!-- 设备 -->
-          <el-button v-if="isSubscribeExamineSBZG && row.statue == 3" style="display:inline-block" type="success" size="mini" @click="handleExamine2(row)">设备</el-button>
+          <el-button v-if="isSubscribeExamineSBZG && row.statue == 3" style="display:inline-block" type="success" size="mini" @click="handleExamine2(row)">审核</el-button>
 
           <!-- 供应商主管 -->
-          <el-button v-if="isSubscribeExamineZG && row.statue == 9" style="display:inline-block" type="success" size="mini" @click="handleExamine3(row)">供应商主管</el-button>
+          <el-button v-if="isSubscribeExamineZG && row.statue == 9" style="display:inline-block" type="success" size="mini" @click="handleExamine3(row)">审核</el-button>
 
 
 
 
           <!-- 场长 -->
-          <el-button v-if="sdchangzhangshenhe  && row.statue == 5 && (row.departmentName == '挤奶处' && row.examine == 1)" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">场长</el-button>
-          <el-button v-else-if="sdchangzhangshenhe  && row.statue == 5 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">场长</el-button>
+          <el-button v-if="sdchangzhangshenhe  && row.statue == 5 && (row.departmentName == '挤奶处' && row.examine == 1)" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">审核</el-button>
+          <el-button v-else-if="sdchangzhangshenhe  && row.statue == 5 && row.departmentName !== '挤奶处'" style="display:inline-block" type="success" size="mini" @click="handleExamine4(row)">审核</el-button>
 
           <!-- 采购 -->
-          <el-button v-if="isSubscribeExamineCG && (row.departmentName == '挤奶处' && row.statue == 15 ) || (row.departmentName !== '挤奶处' && row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine5(row)">采购</el-button>
+          <el-button v-if="isSubscribeExamineCG && (row.departmentName == '挤奶处' && row.statue == 15 ) || (row.departmentName !== '挤奶处' && row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine5(row)">审核</el-button>
 
           <!-- 财务 -->
-          <el-button v-if="isSubscribeExamineCW && row.purchase_type > 0 && row.statue == 7" style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">财务</el-button>
+          <el-button v-if="isSubscribeExamineCW && row.purchase_type > 0 && row.statue == 7" style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核</el-button>
           <!-- 奶厅 -->
-          <el-button v-if="isSubscribeExamineNT && row.departmentName == '挤奶处' && (row.examine !== 1 && row.statue == 5 || row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
+          <el-button v-if="isSubscribeExamineNT && row.departmentName == '挤奶处' && (row.examine !== 1 && row.statue == 5 || row.statue == 11) " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">审核</el-button>
 
-          <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8||row.statue == 12 ||row.statue == 14 ||row.statue == 16)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
+          <el-button v-if="isSubscribeDelete && (row.statue == 4||row.statue == 6||row.statue == 8 ||row.statue == 10 ||row.statue == 12 ||row.statue == 14 ||row.statue == 16)" style="display:inline-block" type="danger" size="mini" @click="form_delete(row)">删除</el-button>
 
 
 
@@ -212,7 +212,8 @@
           style="width: 100%;margin-bottom:30px"
           :row-style="rowStyle"
           :cell-style="cellStyle"
-          class="elTable"
+          class="elTable"
+          :row-class-name="getRowClass"
         >
           <!-- table表格 -->
           <el-table-column label="序号" align="center" type="index" width="50px" />
@@ -272,7 +273,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="使用周期" min-width="120px" align="center">
+          <el-table-column label="使用周期" min-width="120px" align="center" v-if="dialogStatus==='create' ||  (createTemp.purchase_type !== 1 && createTemp.purchase_type !== 3)">
             <template slot-scope="scope">
               <div v-for="item in scope.row.lifeCyclearr">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -282,7 +283,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="合同差异项" min-width="120px" align="center">
+          <el-table-column label="合同差异项" min-width="120px" align="center" v-if="dialogStatus==='create' ||  (createTemp.purchase_type !== 1 && createTemp.purchase_type !== 3)">
             <template slot-scope="scope">
               <div v-for="item in scope.row.contractVarianceItemarr">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -438,10 +439,9 @@
           highlight-current-row
           style="width: 100%;margin-bottom:30px"
           :row-style="rowStyle"
-          :cell-style="cellStyle"
-          class="elTable"
+          :cell-style="cellStyle"
+          :row-class-name="getRowClass"
         >
-          <!-- table表格 -->
           <el-table-column label="序号" align="center" type="index" width="50px" />
           <el-table-column label="备件编号" prop="partCode" align="center" min-width="90">
             <template slot-scope="scope">
@@ -726,24 +726,24 @@
             <el-col>
               <el-form-item label="操作:">
                 <!-- 库管 -->
-                <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2 && seeTemp.departmentName == '挤奶处'" type="success" style="display:inline-block" @click="handleExamine1(row)">库管</el-button>
+                <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2 && seeTemp.departmentName == '挤奶处'" type="success" style="display:inline-block" @click="handleExamine1(row)">审核</el-button>
                <!-- 设备 -->
-               <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">设备</el-button>
+               <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">审核</el-button>
                 <!-- 供应商主管 -->
-                <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">供应商</el-button>
+                <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">审核</el-button>
 
                 <!-- 场长 -->
-                <el-button v-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5 && seeTemp.departmentName == '挤奶处' && seeTemp.examine == 1" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
-                <el-button v-else-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5 && seeTemp.departmentName !== '挤奶处'" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
+                <el-button v-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5 && seeTemp.departmentName == '挤奶处' && seeTemp.examine == 1" type="success" style="display:inline-block" @click="handleExamine4(row)">审核</el-button>
+                <el-button v-else-if=" sdchangzhangshenhe  &&  seeTemp.statue == 5 && seeTemp.departmentName !== '挤奶处'" type="success" style="display:inline-block" @click="handleExamine4(row)">审核</el-button>
 
 
                 <!-- 采购 -->
-                <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 && (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) " type="success" style="display:inline-block" @click="handleExamine5(row)">采购</el-button>
+                <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 && (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) " type="success" style="display:inline-block" @click="handleExamine5(row)">审核</el-button>
 
                 <!-- 财务 -->
-                <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">财务</el-button>
+                <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" size="mini" @click="handleExamine6(row)">审核</el-button>
                 <!-- 奶厅 -->
-                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && (seeTemp.examine !== 1 && seeTemp.statue == 5 || seeTemp.statue == 11)  " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">奶厅</el-button>
+                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && (seeTemp.examine !== 1 && seeTemp.statue == 5 || seeTemp.statue == 11)  " style="display:inline-block" type="success" size="mini" @click="handleExamine7(row)">审核</el-button>
 
 
               </el-form-item>
@@ -876,6 +876,8 @@
           <el-table-column label="备件编号" prop="partCode" align="center" min-width="90" />
           <el-table-column label="备件名称" prop="partName" align="center" min-width="90" />
           <el-table-column label="备件规格" prop="specification" min-width="80px" align="center" />
+          <el-table-column label="供应商" prop="providerName" align="center" min-width="60" />
+          <el-table-column label="备件品牌" prop="brandName" align="center" min-width="60" />
           <el-table-column label="计量单位" prop="unit" align="center" min-width="60" />
           <el-table-column label="现有库存" prop="reportery" align="center" min-width="60" />
           <el-table-column label="价格" prop="price" align="center" min-width="150">
@@ -888,7 +890,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="使用周期" min-width="120px" align="center">
+          <el-table-column label="使用周期" min-width="120px" align="center" v-if="modifyTemp.purchase_type !== 1 && modifyTemp.purchase_type !== 3">
             <template slot-scope="scope">
               <div v-for="item in scope.row.lifeCyclearr">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -898,7 +900,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="合同差异项" min-width="120px" align="center">
+          <el-table-column label="合同差异项" min-width="120px" align="center" v-if="modifyTemp.purchase_type !== 1 && modifyTemp.purchase_type !== 3">
             <template slot-scope="scope">
               <div v-for="item in scope.row.contractVarianceItemarr">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -984,7 +986,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="使用周期" min-width="100px" align="center">
+          <el-table-column label="使用周期" min-width="100px" align="center" v-if="seeTemp.purchase_type !== 1 && seeTemp.purchase_type !== 3">
             <template slot-scope="scope">
               <div v-for="item in scope.row.lifeCyclearr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -994,7 +996,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="合同差异项" min-width="100px" align="center">
+          <el-table-column label="合同差异项" min-width="100px" align="center" v-if="seeTemp.purchase_type !== 1 && seeTemp.purchase_type !== 3">
             <template slot-scope="scope">
               <div v-for="item in scope.row.contractVarianceItemarr" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
                 <el-tooltip class="item" effect="dark" placement="top-start">
@@ -1034,22 +1036,22 @@
             <el-col>
               <el-form-item label="操作:">
                 <!-- 库管 -->
-                <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2 && seeTemp.departmentName == '挤奶处'" type="success" style="display:inline-block" @click="handleExamine1(row)">库管</el-button>
+                <el-button v-if="isSubscribeExamineKG && seeTemp.statue == 2 && seeTemp.departmentName == '挤奶处'" type="success" style="display:inline-block" @click="handleExamine1(row)">审核</el-button>
                <!-- 设备 -->
-               <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">设备</el-button>
+               <el-button v-if="isSubscribeExamineSBZG && seeTemp.statue == 3" type="success" style="display:inline-block" @click="handleExamine2(row)">审核</el-button>
                 <!-- 供应商主管 -->
-                <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">供应</el-button>
+                <el-button v-if="isSubscribeExamineZG && seeTemp.statue == 9" type="success" style="display:inline-block" @click="handleExamine3(row)">审核</el-button>
 
                 <!-- 场长 -->
-                <el-button v-if=" sdchangzhangshenhe  && seeTemp.statue == 5 && seeTemp.departmentName == '挤奶处' && seeTemp.examine == 1" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
-                <el-button v-else-if=" sdchangzhangshenhe  && seeTemp.statue == 5 && seeTemp.departmentName !== '挤奶处'" type="success" style="display:inline-block" @click="handleExamine4(row)">场长</el-button>
+                <el-button v-if=" sdchangzhangshenhe  && seeTemp.statue == 5 && seeTemp.departmentName == '挤奶处' && seeTemp.examine == 1" type="success" style="display:inline-block" @click="handleExamine4(row)">审核</el-button>
+                <el-button v-else-if=" sdchangzhangshenhe  && seeTemp.statue == 5 && seeTemp.departmentName !== '挤奶处'" type="success" style="display:inline-block" @click="handleExamine4(row)">审核</el-button>
 
                 <!-- 采购 -->
-                <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 && (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) " type="success" style="display:inline-block" @click="handleExamine5(row)">采购</el-button>
+                <el-button v-if="isSubscribeExamineCG && seeTemp.statue == 11 && (seeTemp.departmentName == '挤奶处' && seeTemp.statue == 15 ) || (seeTemp.departmentName !== '挤奶处' && seeTemp.statue == 11) " type="success" style="display:inline-block" @click="handleExamine5(row)">审核</el-button>
                 <!-- 财务 -->
-                <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" @click="handleExamine6(row)">财务</el-button>
+                <el-button v-if="isSubscribeExamineCW && seeTemp.purchase_type > 0 && seeTemp.statue == 7 " style="display:inline-block" type="success" @click="handleExamine6(row)">审核</el-button>
                 <!-- 奶厅 -->
-                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && (seeTemp.examine !== 1 && seeTemp.statue == 5 || seeTemp.statue == 11) " style="display:inline-block" type="success" @click="handleExamine7(row)">奶厅</el-button>
+                <el-button v-if="isSubscribeExamineNT && seeTemp.departmentName == '挤奶处' && (seeTemp.examine !== 1 && seeTemp.statue == 5 || seeTemp.statue == 11) " style="display:inline-block" type="success" @click="handleExamine7(row)">审核</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1089,9 +1091,10 @@ export default {
       findAllDepart: [],
       findAllEmploye: [],
       subscriptionStatusList:[
-        {id:0,name:'正常'},
-        {id:1,name:'暂估'},
-        {id:3,name:'赠品'}],//申购状态
+        {id:0,name:'新增申购'},
+        {id:1,name:'暂估申购'},
+        {id:3,name:'赠品申购'},
+        {id:4,name:'奶厅申购'}],//申购状态
       onlineSubscriptionList: [], createDepartList: [], edit: 0,
       requestParams: [
         { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] },
@@ -1112,13 +1115,13 @@ export default {
         update: '编辑',
         create: '新增',
         see: '查看',
-        examine1: '审核1',
-        examine2: '审核2',
-        examine3: '审核3',
-        examine4: '审核4',
-        examine5: '审核5',
-        examine6: '审核6',
-        examine7: '审核7',
+        examine1: '库管审核',
+        examine2: '设备主管审核',
+        examine3: '供应商主管审核',
+        examine4: '场长审核',
+        examine5: '采购审核',
+        examine6: '财务审核',
+        examine7: '职能中心审核',
         special: '特殊申购',
         seepart:'备件申购'
       },
@@ -3482,6 +3485,16 @@ export default {
       this.$nextTick(() => {
         this.$refs['createTemp'].clearValidate()
       })
+    },
+    getRowClass({row, index}) {
+         // 根据数据的不同返回不同的类名
+      if (row.explain1 !== undefined && row.explain1 !== '') {
+        console.log(row,'row77')
+        return 'warning-aa';
+      } else {
+         console.log(row,'row66')
+        return '';
+      }
     }
   }
 }
@@ -3513,4 +3526,9 @@ export default {
 .step-row{
   color: #000;
 }
+</style>
+<style>
+  .el-table .warning-aa {
+    background: #ffd386;
+  }
 </style>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно