Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -4771,17 +4771,18 @@ const xzhscsformData = reactive({
 });
 const sxzhscstableData = ref([]);
 //修正核算参数按钮
-const onxzhscsclick = () => {
-  if(_Gd_gdbh.value == null){
-    xzhscslist.value = false;
-    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能' })
-  }else{
-    xzhscsformData['gdbh'] = _Gd_gdbh.value;
+const onxzhscsclick = () => {
+	console.log(_Gd_gdbh.value)
+  // if(_Gd_gdbh.value == null){
+  //   xzhscslist.value = false;
+  //   ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能' })
+  // }else{
+    // xzhscsformData['gdbh'] = _Gd_gdbh.value;
     // xzhscsformData['cpdh'] = _Gd_cpdh.value;
     // xzhscsformData['gdmc'] = _Gd_cpmc.value;
     // _AccountingParameterdata();
     xzhscslist.value = true;
-  }
+  // }
 };
 //修正核算参数回车
 const xzhscsgetProductValue = () => {
@@ -4790,7 +4791,8 @@ const xzhscsgetProductValue = () => {
 // 修正工单核算参数表格数据
 const _AccountingParameterdata = async ()=>{
 
-  const ProductNamedata = await ProductNameData({workOrder:_Gd_gdbh.value});
+  // const ProductNamedata = await ProductNameData({workOrder:_Gd_gdbh.value});
+  const ProductNamedata = await ProductNameData({workOrder:xzhscsformData['gdbh']});
   if(ProductNamedata.code===0){
 	xzhscsformData['cpdh']=ProductNamedata.data.产品代号
 	xzhscsformData['gdmc']=ProductNamedata.data.产品名称