From aae0b49229d8798a2cc31a8449092e2db62e2407 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 26 三月 2026 11:26:41 +0800
Subject: [PATCH] 绩效管理:人员考勤功能模块

---
 src/views/business/rawMaterialInspection/index.vue |   53 +++++++++++++++++++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index be19b63..dfe0014 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -5,8 +5,7 @@
         <el-row>
           <el-form-item label="IFS鍩�" prop="contract">
             <el-select @keyup.enter.native="refreshTable" v-model="componentData.contract" clearable placeholder="璇烽�夋嫨" size="small">
-              <el-option label="ZTNS" value="ZTNS"/>
-              <el-option label="KJNS" value="KJNS"/>
+              <el-option v-for="(item,index) in contractList" :key="index" :label="item.label" :value="item.value"/>
             </el-select>
           </el-form-item>
           <el-form-item label="鎵瑰彿" prop="updateBatchNo">
@@ -28,36 +27,34 @@
               @keyup.enter.native="refreshTable">
             </el-input>
           </el-form-item>
-          <el-form-item>
-            <el-button v-if="tabIndex === 3 || tabIndex === 4" :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
-              style="color: #3A7BFA;" type="text" @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
-            <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
-            <el-button size="mini" @click="refresh()" >閲嶇疆</el-button>
-          </el-form-item>
-        </el-row>
-        <el-row>
           <el-form-item label="妫�楠岀姸鎬�" prop="inspectStatus" v-if="(tabIndex === 3 || tabIndex === 4) && more">
             <el-select v-model="componentData.inspectStatus" clearable size="small" style="width: 100%;"
-              @change="refreshTable()">
+                       @change="refreshTable()">
               <el-option v-for="(a, i) in queryStatusList" :key="i" :label="a.label" :value="a.value"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="涓嬪彂鏃堕棿" prop="date" v-if="(tabIndex === 3 || tabIndex === 4) && more">
             <el-date-picker v-model="componentData.date" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
-              range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange" @change="refreshTable()"
-              value-format="yyyy-MM-dd">
+                            range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" style="width: 100%;" type="daterange" @change="refreshTable()"
+                            value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="濮旀墭缂栧彿" prop="entrustCode" v-if="(tabIndex === 3 || tabIndex === 4) && more">
             <el-input v-model="componentData.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
-              @keyup.enter.native="refreshTable">
+                      @keyup.enter.native="refreshTable">
             </el-input>
           </el-form-item>
           <el-form-item label="閿�鍞鍗曞垎绫�" prop="orderType" v-if="(tabIndex === 3 || tabIndex === 4) && more">
             <el-select v-model="componentData.orderType" clearable size="small"
-              @keyup.enter.native="refreshTable">
+                       @keyup.enter.native="refreshTable">
               <el-option v-for="(item,index) in orderTypeList" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
             </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button v-if="tabIndex === 3 || tabIndex === 4" :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'"
+              style="color: #3A7BFA;" type="text" @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
+            <el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
+            <el-button size="mini" @click="refresh()" >閲嶇疆</el-button>
           </el-form-item>
         </el-row>
       </el-form>
@@ -121,12 +118,15 @@
       :visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
       <el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
         label-position="right">
-        <el-form-item class="declareObj-form-item" label="IFS鍩�:" prop="contract" style="width: calc(50% - 54px)">
-          <el-tag :type="declareObj.contract==='ZTNS'?'':'success'">{{declareObj.contract}}</el-tag>
-        </el-form-item>
         <el-form-item class="declareObj-form-item" label="璁㈠崟鍙�:" prop="orderNo">
           <el-input v-model="declareObj.orderNo" :disabled="declareType !== 'add'" class="addObj-info" clearable
-            placeholder="" size="small"></el-input>
+                    placeholder="" size="small"></el-input>
+        </el-form-item>
+        <el-form-item class="declareObj-form-item" label="IFS鍩�:" prop="contract">
+          <el-select v-model="declareObj.contract" v-if="declareType === 'add'" clearable size="small">
+            <el-option v-for="(item,index) in contractList" :key="index" :label="item.label" :value="item.value"/>
+          </el-select>
+          <el-tag v-else :type="declareObj.contract==='ZTNS'?'':'success'">{{declareObj.contract}}</el-tag>
         </el-form-item>
         <el-form-item class="declareObj-form-item" label="闆朵欢鍙�:" prop="partNo">
           <el-input v-model="declareObj.partNo" :disabled="declareType !== 'add'" class="addObj-info" clearable
@@ -749,6 +749,16 @@
       upLoading: false,
       orderTypeList: [],
       materialPropList: [],
+      contractList:[
+        {
+          label:"ZTNS",
+          value:"ZTNS"
+        },
+        {
+          label:"KJNS",
+          value:"KJNS"
+        },
+      ]
     }
   },
   mounted() {
@@ -1112,7 +1122,9 @@
               id: this.declareObj.id,
               updateBatchNo: this.declareObj.updateBatchNo,
               orderType: this.declareObj.orderType,
-              materialProp: this.declareObj.materialProp
+              materialProp: this.declareObj.materialProp,
+              partNo: this.declareObj.partNo,
+              contract: this.declareObj.contract
             }).then(res => {
               if (res.code === 200) {
                 this.declareDialogVisible = false
@@ -1197,6 +1209,7 @@
         buyUnitMeas: '', // 鍗曚綅
         isExpire: '', // 鍗曚綅
         orderType: null, // 閿�鍞鍗曞垎绫�
+        materialProp: null, // 鐗╂枡灞炴��
       }
     }
   },

--
Gitblit v1.9.3