Ver código fonte

绩效数据管理问题优化

曹鹤洋 1 ano atrás
pai
commit
73a01db5ff

+ 8 - 2
src/view/job/rewards/rewards.vue

@@ -1229,12 +1229,18 @@ const getJtbhsubmit = (value) => {
 const GetYg = (event, inputName) => {
   console.log(inputName);
   var num = parseInt(inputName) - 1;
-  if (num >= 1 && num <= 10) {
+  if (num >= 1 && num <= 10) {
+	  if(detailData['JL_bh' + num]==undefined){
+		  return
+	  }
     getYg({ sczl_bh: detailData['JL_bh' + num] }).then(response => {
       detailData['jlname' + num] = response.data[0].ygxm;
       detailData['JL_bh' + num] = response.data[0].员工编号;
     });
-  } else if (num >= 10 && num <= 21) {
+  } else if (num >= 10 && num <= 21) {
+	  if(detailData['sczl_bh' + (num - 11)]==undefined){
+	  		  return
+	  }
     getYg({ sczl_bh: detailData['sczl_bh' + (num - 11)] }).then(response => {
       detailData['zrname' + (num - 11)] = response.data[0].ygxm;
       detailData['sczl_bh' + (num - 11)] = response.data[0].员工编号;

+ 34 - 11
src/view/performance/06-packingDocuments/index.vue

@@ -64,7 +64,9 @@
               <el-form-item
                 label="日期"
               >
-                <el-input
+                <el-input
+				type="date" max="9999-12-31" 
+				@focus="rqHandleFocus()"
                   v-model="detailData.sczl_rq"
                   style="width: 120px;"
                 />
@@ -508,8 +510,14 @@ const handleShowDetail = () => {
 }
 
 // 删除
-const handleDelete = () => {
-  console.log(currentRow.value)
+const handleDelete = () => {
+	if(currentRow.value.UniqId==undefined){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
   ElMessageBox.confirm(
     `确认删除这条数据么?`,
     '警告',
@@ -521,12 +529,13 @@ const handleDelete = () => {
   )
     .then(async() => {
       const ret = await deleteTableData(currentRow.value?.UniqId)
-      console.log(ret)
       if (ret === 0) {
         ElMessage({
           type: 'success',
           message: '删除成功',
-        })
+        })
+		getSideData()
+		getTableData()
       } else {
         ElMessage({
           type: 'error',
@@ -650,6 +659,12 @@ const getTableInfo = async(id) => {
   }
 }
 
+//日期获得焦点事件
+const rqHandleFocus = () =>{
+	if(detailData.sczl_rq==''){
+		detailData.sczl_rq = new Date().toISOString().split('T')[0]
+	}
+}
 
 // 获取工序名称
 const getTableGxMc = async(index, row) => {
@@ -726,7 +741,11 @@ const handleShowAdd = async() => {
 	        sczl_Jtbh1: '',
 	        sczl_dedh: '',
 	      }
-	    })
+	    })
+		setTimeout(() => {
+		  formElements = document.getElementById('detail-form').elements
+		  formElements[0].focus()
+		}, 0)
 	  dialogFormVisible.value = true
   }else{ 
 	  await getTableInfo(currentRow.value?.UniqId)
@@ -760,23 +779,27 @@ const addDetailData = async() => {
     restoredData[`sczl_dedh${num}`] = item.sczl_dedh
   })
   const res = await addPackingTable(restoredData)
-  console.log(restoredData)
-  console.log(res)
   if (res.code === 0) {
     ElMessage({
       type: 'success',
       message: '新增成功',
     })
-    dialogFormVisible.value = false
-    getTableData()
+    dialogFormVisible.value = false
+	if(params.date!=''){
+		getTableData()
+	}
     getSideData()
   }
 }
 
-const handleGetYg = async() => {
+const handleGetYg = async() => {
+	if(detailData.sczl_bh==''){
+		return
+	}
   try {
     const res = await getYg({ sczl_bh: detailData.sczl_bh })
     if (res.code === 0) {
+      detailData.sczl_bh = res.data[0].员工编号
       detailData.name = res.data[0].ygxm
     } else {
       detailData.name = ''

+ 24 - 16
src/view/performance/07-otherDocuments/index.vue

@@ -104,7 +104,8 @@
               <el-form-item
                 label="日期"
               >
-                <el-input
+                <el-input
+				type="date" max="9999-12-31"
                   v-model="detailData.Sczl_rq"
                   style="width: 150px"
                 />
@@ -485,15 +486,20 @@ const dialogDedh = ref(false)
 const dialogGylc = ref(false)
 // 新增数据
 const handleShowAdd = () => {
-  if (!currentRow.value) {
-    ElMessage({
-      type: 'info',
-      message: '请选择一条数据'
-    })
-    return
+  type.value = '新增'
+  if (!currentRow.value) {
+   detailData.Sczl_bh1 = '';
+   detailData.Sczl_cl = '';
+   detailData.sys_bh = '';
+   detailData.Sczl_desc = '';
+   detailData.sczl_gdbh = '';
+   detailData.Sczl_gxmc = '';
+   detailData.sczl_Type = '';
+   detailData.sczl_gxh = '';
+  }else{
+  	  Object.assign(detailData, currentRow.value)
   }
-  type.value = '新增'
-  Object.assign(detailData, currentRow.value)
+  
   // dialogFormVisible.value = true
   const date = dayjs().format('YYYY-MM-DD')
   detailData.Sczl_rq = date
@@ -642,18 +648,19 @@ const addDetailData = async() => {
     Sczl_dedh: detailData.sys_bh,
     Sczl_desc: detailData.Sczl_desc,
   }
-  console.log(restoredData)
   const res = await add(restoredData)
-  console.log(restoredData)
-  console.log(res)
   if (res.code === 0) {
     ElMessage({
       type: 'success',
       message: '新增成功',
     })
-    dialogFormVisible.value = false
+    dialogFormVisible.value = false
+	if(params.date!=''){
+		getTableData()
+	}
+	getSideData()
   }
-  getSideData()
+  
 }
 // 修改
 const updateDetailData = async() => {
@@ -666,7 +673,7 @@ const updateDetailData = async() => {
     Sczl_gxmc: detailData.Sczl_gxmc,
     sczl_gxh: detailData.sczl_gxh,
     Sczl_cl: detailData.Sczl_cl,
-    Sczl_dedh: '',
+    Sczl_dedh: detailData.sys_bh,
     Sczl_desc: detailData.Sczl_desc,
   }
   const res = await updateData(params)
@@ -701,7 +708,8 @@ let formElements
 const moveFocus = (event) => {
   const index = Array.from(formElements).indexOf(event.target)
   const key = event.key
-  event.preventDefault()
+  event.preventDefault()
+  console.log(formElements)
   switch (index) {
     case 0:
       if (key === 'ArrowDown') {

+ 115 - 241
src/view/performance/08-timesheet/index.vue

@@ -48,21 +48,15 @@
             width="800px"
           >
             <!-- <el-scrollbar height="500px"> -->
-            <el-form
-              id="detail-form"
-              ref="elFormRef"
-              :model="detailData"
-              label-position="left"
+            <el-form id="detail-form" ref="elFormRef"
+              :model="detailData" label-position="left"
               @keyup="moveFocus"
             >
 
               <!-- 日期 -->
               <el-row>
-                <el-form-item
-                  label="日期"
-                  prop="name"
-                >
-                  <el-input
+                <el-form-item label="日期" prop="name" >
+                  <el-input type="date" max="9999-12-31"
                     v-model="detailData.wgjs_rq"
                     style="width: 100px;"
                   />
@@ -71,287 +65,141 @@
 
               <!-- 标题栏 -->
               <el-row :gutter="10">
-                <el-col :span="3">
-                  <span>员工编号</span>
-                </el-col>
-                <el-col :span="3">
-                  <span>员工姓名</span>
-                </el-col>
-                <el-col :span="3">
-                  <span>计时</span>
-                </el-col>
-                <el-col :span="12">
-                  <span>原因备注</span>
-                </el-col>
-                <el-col :span="3">
-                  <span>冲月定额</span>
-                </el-col>
+                <el-col :span="3"> <span>员工编号</span> </el-col>
+                <el-col :span="3"> <span>员工姓名</span> </el-col>
+                <el-col :span="3"> <span>计时</span> </el-col>
+                <el-col :span="12"> <span>原因备注</span> </el-col>
+                <el-col :span="3"> <span>冲月定额</span> </el-col>
               </el-row>
 
               <!-- 员工1 -->
-              <el-row
-                :gutter="5"
-                style="margin-top: 10px;"
-              >
+              <el-row :gutter="5" style="margin-top: 10px;" >
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_bh1"
-                    :formatter="val => val.toUpperCase()"
-                  />
+                  <el-input v-model="detailData.wgjs_bh1" :formatter="val => val.toUpperCase()" />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.name1"
-                    readonly
-                  />
+                  <el-input v-model="detailData.name1" readonly />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_js1"
-                  />
+                  <el-input v-model="detailData.wgjs_js1" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input
-                    v-model="detailData.wgjs_yy1"
-                  />
+                  <el-input v-model="detailData.wgjs_yy1" />
                 </el-col>
                 <el-col :span="3">
-                  <!-- <el-input
-                    v-model="detailData.wgjs_冲定额1"
-
-                  /> -->
-                  <el-select
-                    v-model="detailData.wgjs_冲定额1"
-                    placeholder=" "
-                  >
-                    <el-option
-                      label=""
-                      value=""
-                    />
-                    <el-option
-                      label="是"
-                      value="是"
-                    />
+                  <el-select v-model="detailData.wgjs_冲定额1" >
+                    <el-option label="" value="" />
+                    <el-option label="是" value="是" />
                   </el-select>
                 </el-col>
               </el-row>
 
               <!-- 员工2 -->
-              <el-row
-                :gutter="5"
-                style="margin-top: 10px;"
-              >
+              <el-row :gutter="5" style="margin-top: 10px;" >
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_bh2"
-                    :formatter="val => val.toUpperCase()"
-                  />
+                  <el-input v-model="detailData.wgjs_bh2" :formatter="val => val.toUpperCase()" />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.name2"
-                    readonly
-                  />
+                  <el-input v-model="detailData.name2" readonly />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_js2"
-                  />
+                  <el-input v-model="detailData.wgjs_js2" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input
-                    v-model="detailData.wgjs_yy2"
-                  />
+                  <el-input v-model="detailData.wgjs_yy2" />
                 </el-col>
                 <el-col :span="3">
-                  <el-select
-                    v-model="detailData.wgjs_冲定额2"
-                    placeholder=" "
-                  >
-                    <el-option
-                      label=""
-                      value=""
-                    />
-                    <el-option
-                      label="是"
-                      value="是"
-                    />
+                  <el-select v-model="detailData.wgjs_冲定额2" >
+                    <el-option label="" value="" />
+                    <el-option label="是" value="是"/>
                   </el-select>
                 </el-col>
               </el-row>
 
               <!-- 员工3 -->
-              <el-row
-                :gutter="5"
-                style="margin-top: 10px;"
-              >
+              <el-row :gutter="5" style="margin-top: 10px;" >
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_bh3"
-                    :formatter="val => val.toUpperCase()"
-                  />
+                  <el-input v-model="detailData.wgjs_bh3" :formatter="val => val.toUpperCase()" />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.name3"
-                    readonly
-                  />
+                  <el-input v-model="detailData.name3" readonly />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_js3"
-                  />
+                  <el-input v-model="detailData.wgjs_js3" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input
-                    v-model="detailData.wgjs_yy3"
-                  />
+                  <el-input v-model="detailData.wgjs_yy3" />
                 </el-col>
                 <el-col :span="3">
-                  <el-select
-                    v-model="detailData.wgjs_冲定额3"
-                    placeholder=" "
-                  >
-                    <el-option
-                      label=""
-                      value=""
-                    />
-                    <el-option
-                      label="是"
-                      value="是"
-                    />
+                  <el-select v-model="detailData.wgjs_冲定额3" >
+                    <el-option label="" value="" />
+                    <el-option label="是" value="是"/>
                   </el-select>
                 </el-col>
               </el-row>
 
               <!-- 员工4 -->
-              <el-row
-                :gutter="5"
-                style="margin-top: 10px;"
-              >
+              <el-row :gutter="5" style="margin-top: 10px;" >
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_bh4"
-                    :formatter="val => val.toUpperCase()"
-                  />
+                  <el-input v-model="detailData.wgjs_bh4" :formatter="val => val.toUpperCase()" />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.name4"
-                    readonly
-                  />
+                  <el-input v-model="detailData.name4" readonly />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_js4"
-                  />
+                  <el-input v-model="detailData.wgjs_js4" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input
-                    v-model="detailData.wgjs_yy4"
-                  />
+                  <el-input v-model="detailData.wgjs_yy4" />
                 </el-col>
                 <el-col :span="3">
-                  <el-select
-                    v-model="detailData.wgjs_冲定额4"
-                    placeholder=" "
-                  >
-                    <el-option
-                      label=""
-                      value=""
-                    />
-                    <el-option
-                      label="是"
-                      value="是"
-                    />
+                  <el-select v-model="detailData.wgjs_冲定额4" >
+                    <el-option label="" value="" />
+                    <el-option label="是" value="是"/>
                   </el-select>
                 </el-col>
               </el-row>
 
               <!-- 员工5 -->
-              <el-row
-                :gutter="5"
-                style="margin-top: 10px;"
-              >
+              <el-row :gutter="5" style="margin-top: 10px;" >
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_bh5"
-                    :formatter="val => val.toUpperCase()"
-                  />
+                  <el-input v-model="detailData.wgjs_bh5" :formatter="val => val.toUpperCase()" />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.name5"
-                    readonly
-                  />
+                  <el-input v-model="detailData.name5" readonly />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_js5"
-                  />
+                  <el-input v-model="detailData.wgjs_js5" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input
-                    v-model="detailData.wgjs_yy5"
-                  />
+                  <el-input v-model="detailData.wgjs_yy5" />
                 </el-col>
                 <el-col :span="3">
-                  <el-select
-                    v-model="detailData.wgjs_冲定额5"
-                    placeholder=" "
-                  >
-                    <el-option
-                      label=""
-                      value=""
-                    />
-                    <el-option
-                      label="是"
-                      value="是"
-                    />
+                  <el-select v-model="detailData.wgjs_冲定额5" >
+                    <el-option label="" value="" />
+                    <el-option label="是" value="是"/>
                   </el-select>
                 </el-col>
               </el-row>
 
               <!-- 员工6 -->
-              <el-row
-                :gutter="5"
-                style="margin-top: 10px;"
-              >
+              <el-row :gutter="5" style="margin-top: 10px;" >
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_bh6"
-                    :formatter="val => val.toUpperCase()"
-                  />
+                  <el-input v-model="detailData.wgjs_bh6" :formatter="val => val.toUpperCase()" />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.name6"
-                    readonly
-                  />
+                  <el-input v-model="detailData.name6" readonly />
                 </el-col>
                 <el-col :span="3">
-                  <el-input
-                    v-model="detailData.wgjs_js6"
-                  />
+                  <el-input v-model="detailData.wgjs_js6" />
                 </el-col>
                 <el-col :span="12">
-                  <el-input
-                    v-model="detailData.wgjs_yy6"
-                  />
+                  <el-input v-model="detailData.wgjs_yy6" />
                 </el-col>
                 <el-col :span="3">
-                  <el-select
-                    v-model="detailData.wgjs_冲定额6"
-                    placeholder=" "
-                  >
-                    <el-option
-                      label=""
-                      value=""
-                    />
-                    <el-option
-                      label="是"
-                      value="是"
-                    />
+                  <el-select v-model="detailData.wgjs_冲定额6" >
+                    <el-option label="" value="" />
+                    <el-option label="是" value="是"/>
                   </el-select>
                 </el-col>
               </el-row>
@@ -361,10 +209,7 @@
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="closeDialog">取 消</el-button>
-                <el-button
-                  type="primary"
-                  @click="enterDialog"
-                >确 定</el-button>
+                <el-button type="primary" @click="enterDialog" >确 定</el-button>
               </div>
             </template>
           </el-dialog>
@@ -604,8 +449,8 @@ const dialogFormVisible = ref(false)
 // 查改
 const handleShowDetail = async() => {
   type.value = 'update'
-  const { wgjs_rq, wgjs_bh1 } = currentRow.value
-  const res = await getDetail({ wgjs_rq, wgjs_bh1 })
+  const { UniqId } = currentRow.value
+  const res = await getDetail({ UniqId })
   if (res.code === 0) {
     Object.assign(detailData, res.data)
     // dialogFormVisible.value = true
@@ -614,17 +459,48 @@ const handleShowDetail = async() => {
 }
 
 // 新增数据
-const handleShowAdd = async() => {
-  // const { wgjs_rq, wgjs_bh1 } = currentRow.value
-  // const res = await getDetail({ wgjs_rq, wgjs_bh1 })
-  // if (res.code === 0) {
-  //   type.value = 'add'
-  //   Object.assign(detailData, res.data)
-
-  //   detailData['wgjs_rq'] = dayjs().format('YYYY-MM-DD')
-
-  //   // dialogFormVisible.value = true   
-  // }
+const handleShowAdd = () => {
+	type.value = 'add';
+	if(!currentRow.value){
+		detailData.wgjs_rq= '';
+	  
+		detailData.wgjs_bh1= '';
+		detailData.wgjs_js1= '';
+		detailData.wgjs_yy1= '';
+		detailData.wgjs_冲定额1= '';
+	  
+		detailData.wgjs_bh2= '';
+		detailData.wgjs_js2= '';
+		detailData.wgjs_yy2= '';
+		detailData.wgjs_冲定额2= '';
+		
+		detailData.wgjs_bh3= '';
+		detailData.wgjs_js3= '';
+		detailData.wgjs_yy3= '';
+		detailData.wgjs_冲定额3= '';
+		
+		detailData.wgjs_bh4= '';
+		detailData.wgjs_js4= '';
+		detailData.wgjs_yy4= '';
+		detailData.wgjs_冲定额4= '';
+		
+		detailData.wgjs_bh5= '';
+		detailData.wgjs_js5= '';
+		detailData.wgjs_yy5= '';
+		detailData.wgjs_冲定额5= '';
+		
+		detailData.wgjs_bh6= '';
+		detailData.wgjs_js6= '';
+		detailData.wgjs_yy6= '';
+		detailData.wgjs_冲定额6= '';
+		
+	}else{
+  	  Object.assign(detailData, currentRow.value)
+	}
+  
+  // dialogFormVisible.value = true
+  const date = dayjs().format('YYYY-MM-DD')
+  detailData.wgjs_rq = date
   showDialog()
 }
 
@@ -639,7 +515,8 @@ const enterDialog = async() => {
 // 新增
 const addDetailData = async() => {
   const restoredData = {
-    wgjs_rq: detailData.wgjs_rq,
+    wgjs_rq: detailData.wgjs_rq,
+	
     wgjs_bh1: detailData.wgjs_bh1,
     wgjs_js1: detailData.wgjs_js1,
     wgjs_yy1: detailData.wgjs_yy1,
@@ -669,16 +546,19 @@ const addDetailData = async() => {
     wgjs_js6: detailData.wgjs_js6,
     wgjs_yy6: detailData.wgjs_yy6,
     wgjs_冲定额6: detailData.wgjs_冲定额6,
-  }
-  console.log(restoredData)
+  }
+  restoredData.sys_id = sys_id;
   const res = await createData(restoredData)
-
-  console.log(res)
   if (res.code === 0) {
     ElMessage({
       type: 'success',
       message: '新增成功',
-    })
+    })
+	//刷新
+	if(params.date!=''){
+      getTableData({ date: params.date, page: page.value.toString(), limit: limit.value.toString() })
+	}
+	getSideData()
     dialogFormVisible.value = false
   }
 }
@@ -695,14 +575,9 @@ const updateDetailData = async() => {
       message: '更新成功'
     })
     params.type = 'getTableData'
-    // page.value = 1
-    handleCurrentChange()
-    // if(response.code==0){
-    // 		 ElMessage({
-    // 		   type: 'success',
-    // 		   message: '更新成功',
-    // 		 })
-    // }
+    if(params.date!=''){
+      getTableData({ date: params.date, page: page.value.toString(), limit: limit.value.toString() })
+    }
     dialogFormVisible.value = false
   }
 }
@@ -724,7 +599,6 @@ const closeDialog = () => {
 
 let formElements
 const moveFocus = async(event) => {
-  console.log(event)
   const index = Array.from(formElements).indexOf(event.target)
   const key = event.key
   event.preventDefault()

+ 6 - 1
src/view/performance/09-workOrderVerification/index.vue

@@ -957,7 +957,12 @@ const addDetailData = async () => {
     ElMessage({
       type: 'success',
       message: '新增成功',
-    })
+    })
+	//刷新
+	if(params.date!=''){
+	  getTableData()
+	}
+	getSideData()
     dialogFormVisible.value = false
   }
 };

+ 39 - 11
src/view/performance/Dayreportattached.vue

@@ -620,9 +620,16 @@ const updateDetailData = async() => {
 	 		 ElMessage({
 	 		   type: 'success',
 	 		   message: '新增成功',
-	 		 })
-	 }
-	 dialogFormVisible.value = false
+	 		 })
+			 dialogFormVisible.value = false
+			 //刷新侧边栏
+			 getTabdata()
+			 if(params.date != ''){
+			 	//刷新页面
+			 	getTableData()
+			 }
+	 }
+	 
  }else{
 	 const response = await addedit(restoredData);
 	  if(response.code==0){
@@ -676,14 +683,35 @@ const ent = (event,id1,id2,id3) => {
     }
   }
 }
-const AddDel = async (value) => {
-  const response = await adddel({UniqId:'0'});
-  if (response.code === 0) {
-	 ElMessage({
-	   type: 'success',
-	   message: '删除成功',
-	 })
-  }
+const AddDel = (value) => {
+	if(typeof(lastCellValue)=='object'){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	ElMessageBox.confirm(
+	  `确认删除这条数据么?`,
+	  '警告',
+	  {
+	    confirmButtonText: '确认',
+	    cancelButtonText: '取消',
+	    type: 'warning',
+	  }
+	).then(async() => {
+		const response = await adddel({UniqId:lastCellValue});
+		if (response.code === 0) {
+			ElMessage({
+			  type: 'success',
+			  message: '删除成功',
+			})
+			//刷新侧边栏
+			getTabdata()
+			//刷新页面
+			getTableData()
+		}
+	})
 }
 const ADD=ref('0')
 //新增

+ 37 - 11
src/view/performance/Dayreports.vue

@@ -1567,15 +1567,35 @@ function onDel() {
 	Del()
 }
 //删除
-const Del = async () => {
-  const response = await productiondel({UniqId:lastCellValue});
-  if (response.code === 0) {
-	ElMessage({
-	  type: 'success',
-	  message: '删除成功',
+const Del = () => {
+	if(typeof(lastCellValue)=='object'){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	ElMessageBox.confirm(
+	  `确认删除这条数据么?`,
+	  '警告',
+	  {
+	    confirmButtonText: '确认',
+	    cancelButtonText: '取消',
+	    type: 'warning',
+	  }
+	).then(async() => {
+		const response = await productiondel({UniqId:lastCellValue});
+		if (response.code === 0) {
+			ElMessage({
+			  type: 'success',
+			  message: '删除成功',
+			})
+			//刷新侧边栏
+			getTabdata()
+			//刷新页面
+			getTableData()
+		}
 	})
-  }
-  getTableData()
 }
 //同步
 function synchronous() {
@@ -1914,10 +1934,16 @@ const updateDetailData = async() => {
 		 ElMessage({
 		   type: 'success',
 		   message: '新增成功',
-		 })
+		 })
+		 dialogFormVisible.value = false
+		 //刷新侧边栏
+		 getTabdata()
+		 if(params.date != ''){
+		 	//刷新页面
+		 	getTableData()
+		 }
 	 }
-  	 dialogFormVisible.value = false
-	 getTableData()
+  	 
   }else{
   	  const response = await productionedit(restoredData);
 	  if(response.code==0){

+ 60 - 12
src/view/performance/MachineDocuments.vue

@@ -1006,6 +1006,15 @@ const GetMachineScrapFactor = async (value) => {
   if(response.code==0){
 	const rowIndex = tableData.findIndex(row => row.UniqId === lastCellValue);
 	tableData[rowIndex].sczl_废品率系数 = response.data.num;
+  ElMessage({
+  	  type: 'success',
+  	  message: '刷新成功',
+  	})
+  }else{
+  	  ElMessage({
+  	    type: 'error',
+  	    message: '刷新失败',
+  	  })
   }
 }
 
@@ -1077,9 +1086,15 @@ const updateDetailData = async() => {
   	 		 ElMessage({
   	 		   type: 'success',
   	 		   message: '新增成功',
-  	 		 })
+  	 		 })
+			 //刷新侧边栏
+			 getTabdata()
+			 if(params.date != ''){
+			 			 //刷新页面
+			 			 getTableData()
+			 }
+			 dialogFormVisible.value = false
   	 }
-  	 dialogFormVisible.value = false
   }else{
   	     formData.value.UniqId=lastCellValue
   	 	restoredData.UniqId='5'
@@ -1098,16 +1113,35 @@ const updateDetailData = async() => {
   }
  
 //删除
-const MachineDel = async () => {
-  const response = await machineDel({UniqId:lastCellValue});
-  if (response.code === 0) {
-	
-	ElMessage({
-	  type: 'success',
-	  message: '删除成功',
+const MachineDel = () => {
+	if(typeof(lastCellValue)=='object'){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	ElMessageBox.confirm(
+	  `确认删除这条数据么?`,
+	  '警告',
+	  {
+	    confirmButtonText: '确认',
+	    cancelButtonText: '取消',
+	    type: 'warning',
+	  }
+	).then(async() => {
+		const response = await machineDel({UniqId:lastCellValue});
+		if (response.code === 0) {
+			ElMessage({
+			  type: 'success',
+			  message: '删除成功',
+			})
+			//刷新侧边栏
+			getTabdata()
+			//刷新页面
+			getTableData()
+		}
 	})
-  }
-  getTableData()
 }
 const handleNodeClick = (node,check) => {
   //存放当前节点的nodeId
@@ -1137,7 +1171,21 @@ function onSearch() {
 	GetmachineLocate()
 }
 // 刷新废品率系数
-function onRefresh() {
+function onRefresh() {
+	if(params.date=='' || ScrapFactor.gdbh==''){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	if(ScrapFactor.type==''){
+		ElMessage({
+		  type: 'warning',
+		  message: '该记录检验类别为空',
+		})
+		return
+	}
 	GetMachineScrapFactor(ScrapFactor)
 }
 const ADD=ref('0')

+ 67 - 17
src/view/performance/Manualdocuments.vue

@@ -1398,10 +1398,17 @@ const selectJY = (event) => {
 const GetScrapFactor = async (value) => {
   const response = await shougonggetScrapFactor(value);
   if(response.code==0){
-	console.log(response.data.num)
 	const rowIndex = tableData.findIndex(row => row.UniqId === lastCellValue);
-	console.log(rowIndex)
-	tableData[rowIndex].sczl_废品率系数 = response.data.num;
+	tableData[rowIndex].sczl_废品率系数 = response.data.num;
+	ElMessage({
+	  type: 'success',
+	  message: '刷新成功',
+	})
+  }else{
+	  ElMessage({
+	    type: 'error',
+	    message: '刷新失败',
+	  })
   }
   // console.log(response)
   // const rowIndex = tableData.findIndex(row => row.UniqId === 123);
@@ -1425,7 +1432,21 @@ const ScrapFactor={
 	type:'',
 }
 // 刷新废品率系数
-function onRefresh() {
+function onRefresh() {
+	if(params.date=='' || ScrapFactor.gdbh==''){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	if(ScrapFactor.type==''){
+		ElMessage({
+		  type: 'warning',
+		  message: '该记录检验类别为空',
+		})
+		return
+	}
 	GetScrapFactor(ScrapFactor)
 }
 
@@ -1503,12 +1524,19 @@ const updateDetailData = async() => {
   	 ADD.value='0'
   	 console.log(response)
   	 if(response.code==0){
-  	 		 ElMessage({
-  	 		   type: 'success',
-  	 		   message: '新增成功',
-  	 		 })
+		 ElMessage({
+		   type: 'success',
+		   message: '新增成功',
+		 })
+		 //刷新侧边栏
+		 getTabdata()
+		 if(params.date != ''){
+			 //刷新页面
+			 getTableData()
+		 }
+		 dialogFormVisible.value = false
   	 }
-  	 dialogFormVisible.value = false
+  	 
   }else{
   	const response = await shougongedit(restoredData);
 	  if(response.code==0){
@@ -1526,15 +1554,37 @@ function onDel() {
 }
 
 //删除
-const Del = async () => {
-  const response = await shougongdel({UniqId:lastCellValue});
-  if (response.code === 0) {
-	ElMessage({
-	  type: 'success',
-	  message: '删除成功',
+const Del = () => {
+	if(typeof(lastCellValue)=='object'){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	
+	ElMessageBox.confirm(
+	  `确认删除这条数据么?`,
+	  '警告',
+	  {
+	    confirmButtonText: '确认',
+	    cancelButtonText: '取消',
+	    type: 'warning',
+	  }
+	).then(async() => {
+		const response = await shougongdel({UniqId:lastCellValue});
+		if (response.code === 0) {
+			ElMessage({
+			  type: 'success',
+			  message: '删除成功',
+			})
+			//刷新侧边栏
+			getTabdata()
+			//刷新页面
+			getTableData()
+		}
 	})
-  }
-  getTableData()
+ 
 }
 const displayMod = ref('')
 // 按工单显示

+ 37 - 10
src/view/performance/Packagingoutput.vue

@@ -656,9 +656,15 @@ const updateDetailData = async() => {
 	 		 ElMessage({
 	 		   type: 'success',
 	 		   message: '新增成功',
-	 		 })
+	 		 })
+			 dialogFormVisible.value = false
+			 //刷新侧边栏
+			 getTabdata()
+			 if(params.date != ''){
+			 	//刷新页面
+			 	getTableData()
+			 }
 	 }
-	 dialogFormVisible.value = false
   }else{
   	  const res = await edit(restoredData)
 	 if(res.code==0){
@@ -672,15 +678,36 @@ const updateDetailData = async() => {
 }
 
 
-const GxMcdel = async () => {
-  const response = await del({UniqId:lastCellValue});
-  if (response.code === 0) {
-	ElMessage({
-	  type: 'success',
-	  message: '删除成功',
+const GxMcdel = () => {
+	if(typeof(lastCellValue)=='object'){
+		ElMessage({
+		  type: 'warning',
+		  message: '未选中记录',
+		})
+		return
+	}
+	
+	ElMessageBox.confirm(
+	  `确认删除这条数据么?`,
+	  '警告',
+	  {
+	    confirmButtonText: '确认',
+	    cancelButtonText: '取消',
+	    type: 'warning',
+	  }
+	).then(async() => {
+		const response = await del({UniqId:lastCellValue});
+		if (response.code === 0) {
+			ElMessage({
+			  type: 'success',
+			  message: '删除成功',
+			})
+			//刷新侧边栏
+			getTabdata()
+			getTableData()
+		}
 	})
-  }
-  getTableData()
+  
 }
 
 // 搜索