审批与放行查询

src/views/modules/srmPart/partApprovalList.vue

@@ -8,15 +8,47 @@
             <span style="cursor: pointer" slot="label" @click="getBaseList(1100)"><a href="#">产品编码</a></span>
             <el-input v-model="searchData.partNo" style="width: 130px"></el-input>
           </el-form-item>
+          <el-form-item :label="'请求时间'" >
+            <el-date-picker
+              style="width: 130px"
+              v-model="searchData.startDate"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="Start">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item :label="'To'" >
+            <el-date-picker
+              style="width: 130px"
+              v-model="searchData.endDate"
+              type="date"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              placeholder="End">
+            </el-date-picker>
+          </el-form-item>
+           <!-- <el-form-item :label="'状态:'">
+            <el-select v-model="searchData.partStage"  style="width: 130px">
+              <el-option label="审批通过" value="Approved"></el-option>
+              <el-option label="审批未通过" value="Created"></el-option>
+            </el-select>
+          </el-form-item> -->
+          <!-- <el-form-item :label="'特别放行:'">
+            <el-select v-model="searchData.specialRelease"  style="width: 130px">
+              <el-option label="Y" value="Y"></el-option>
+              <el-option label="N" value="N"></el-option>
+            </el-select>
+          </el-form-item> -->
+          <!-- </el-form-item>
           <el-form-item :label="'NPC货号:'">
             <el-input v-model="searchData.npc" style="width: 130px"></el-input>
           </el-form-item>
           <el-form-item :label="'产品名称:'">
             <el-input v-model="searchData.partDesc" style="width: 130px"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item :label="' '">
             <el-button class="customer-bun-min" type="primary" @click="getMainData" style="">查询</el-button>
-          
           </el-form-item>
         </el-col>
       </el-row>
@@ -55,8 +87,8 @@
         width="160"
         label="Action">
         <template slot-scope="scope">
-          <el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'COMPLETED' || scope.row.flowStatus === 'TERMINATED'" @click="handleRestart(scope.row)">重新审批 |</el-link>
-          <el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'RUNNING'" @click="openApproveDialog(scope.row)">审批 |</el-link>
+          <el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'COMPLETED' || scope.row.flowStatus === 'TERMINATED'" @click="handleRestart(scope.row)">重新审批</el-link>
+          <el-link style="cursor: pointer" v-if="scope.row.flowStatus === 'RUNNING'" @click="openApproveDialog(scope.row)">审批</el-link>
         
         </template>
       </el-table-column>
@@ -180,15 +212,11 @@ export default {
         partNo: '',
         npc: '',
         partDesc: '',
-        partSpec: '',
         orderType: '产品资料',
-        buyerName: '',
-        sourcingName: '',
-        category: '',
-        unit: '',
-        status: '',
-        codeNo: '',
-        createBy: '',
+        startDate: '',
+        endDate: '',
+        partStage: '',
+        specialRelease: '',
         site: this.$store.state.user.site,
         page: 1,
         limit: 10
@@ -199,7 +227,7 @@ export default {
       tagNo: '',
       mainDataList: [],
       dataListLoading: false,
-      activeName: 'basicInfo',
+      activeName: 'approval',
         // 审批对话框
       approveDialogVisible: false,
       approveLoading: false,
@@ -449,25 +477,25 @@ export default {
           sortLv: 0,
           status: true,
           fixed: false
-        },
-         {
-          userId: this.$store.state.user.name,
-          functionId: this.functionId,
-          serialNumber: 'partTableFlowStatus',
-          tableId: 'partTable',
-          tableName: '产品信息',
-          columnProp: 'flowStatus',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '审批状态',
-          columnWidth: '100',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
         }
+        //  {
+        //   userId: this.$store.state.user.name,
+        //   functionId: this.functionId,
+        //   serialNumber: 'partTableFlowStatus',
+        //   tableId: 'partTable',
+        //   tableName: '产品信息',
+        //   columnProp: 'flowStatus',
+        //   headerAlign: 'center',
+        //   align: 'center',
+        //   columnLabel: '审批状态',
+        //   columnWidth: '100',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: false
+        // }
       ],
       exportName: '产品信息' + this.dayjs().format('YYYYMMDDHHmmss')
  
@@ -648,12 +676,12 @@ export default {
      // 打开审批对话框
     openApproveDialog(row) {
       this.approveData = {
-        applyNo: row.flowNodeInstanceData.applyNo,
-        site: row.flowNodeInstanceData.site,
-        orderType: row.flowNodeInstanceData.orderType,
-        flowCode: row.flowNodeInstanceData.flowCode,
-        flowVersion: row.flowNodeInstanceData.flowVersion,
-        nodeCode: row.flowNodeInstanceData.nodeCode,
+        applyNo: row.applyNo,
+        site: row.site,
+        orderType: row.orderType,
+        flowCode: row.flowCode,
+        flowVersion: row.flowVersion,
+        nodeCode: row.nodeCode,
         comment: ''
        
       }