diff --git a/components/sample/auncel-select-popup.vue b/components/sample/auncel-select-popup.vue
index c011615..f358e63 100644
--- a/components/sample/auncel-select-popup.vue
+++ b/components/sample/auncel-select-popup.vue
@@ -49,7 +49,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['update:showAuncelSelector'])
+const emit = defineEmits(['update:showAuncelSelector', 'doSelect'])
 
 // 响应式数据
 const auncelList = ref([])
@@ -64,15 +64,12 @@ const open = () => {
 }
 
 const close = () => {
-  console.log('auncel-selector close触发')
   auncelList.value = []
-  uni.$emit('auncelSelector_close')
   closeDeviceListener()
   emit('update:showAuncelSelector', false)
 }
 
 const getPageData = () => {
-  uni.showLoading({ title: '加载中...' })
   nx.$api.laboratory
     .getDeviceLaboratoryListBy({
       deviceType: 'auncel',
@@ -93,11 +90,6 @@ const getPageData = () => {
         controlRealName: ''
       }))
       auncelList.value = dataList
-      uni.hideLoading()
-    })
-    .catch(err => {
-      console.error('加载天平列表失败:', err)
-      uni.hideLoading()
     })
 }
 
@@ -109,7 +101,7 @@ const doSelect = index => {
     return
   }
 
-  if (currentAuncel.controlRealName && currentAuncel.controlRealName !== userInfo.value.realname) {
+  if (currentAuncel.controlRealName && currentAuncel.controlRealName !== userInfo.value.nickname) {
     uni.showToast({
       title: `当前天平正被“${currentAuncel.controlRealName}”使用，请选择其他天平！`,
       icon: 'none'
@@ -132,15 +124,15 @@ const doSelect = index => {
       deviceCode: currentAuncel.code,
       deviceName: currentAuncel.name,
       isControl: true,
-      controlRealName: userInfo.value.realname
+      controlRealName: userInfo.value.nickname
     }
   }
 
   const sendControl = () => {
     const controlData = JSON.stringify(controlDevice)
     nx.$measure.send(controlData)
-    console.log('controlDevice', controlData)
-    uni.$emit('auncelSelector_doSelect', controlDevice)
+    emit('update:showAuncelSelector', false)
+    emit('doSelect', controlDevice)
   }
 
   if (delayFlag) {
@@ -159,7 +151,7 @@ const releaseDeviceControl = deviceId => {
     data: {
       deviceId,
       isControl: false,
-      controlRealName: userInfo.value.realname
+      controlRealName: userInfo.value.nickname
     }
   }
   nx.$measure.send(JSON.stringify(controlDevice))
diff --git a/nx/api/assayTask.js b/nx/api/assayTask.js
index 4ea479f..16e0838 100644
--- a/nx/api/assayTask.js
+++ b/nx/api/assayTask.js
@@ -54,7 +54,10 @@ const execSendSample = data => {
   return request({
     url: '/qms/bus/qmsBusAssayTask/sendSample',
     method: 'POST',
-    data: data
+    data: data,
+    custom: {
+      showSuccess: true
+    }
   })
 }
 
diff --git a/pages.json b/pages.json
index 4ca7e0b..bb35813 100644
--- a/pages.json
+++ b/pages.json
@@ -160,13 +160,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-look",
-			"style": {
-				"navigationBarTitleText": "找样理样",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-receive",
 			"style": {
@@ -174,13 +167,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-weigh",
-			"style": {
-				"navigationBarTitleText": "样品称重",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-work-list",
 			"style": {
@@ -209,20 +195,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/auncel/auncel-weigh",
-			"style": {
-				"navigationBarTitleText": "样品称重",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/analysis/auncel/auncel-select",
-			"style": {
-				"navigationBarTitleText": "选择天平",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-report",
 			"style": {
@@ -237,20 +209,6 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/analysis/sample/sample-send",
-			"style": {
-				"navigationBarTitleText": "送样",
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path": "pages/analysis/sample/sample-review",
-			"style": {
-				"navigationBarTitleText": "样重复核",
-				"navigationStyle": "custom"
-			}
-		},
 		{
 			"path": "pages/analysis/sample/sample-print",
 			"style": {
diff --git a/pages/analysis/auncel/auncel-weigh.vue b/pages/analysis/auncel/auncel-weigh.vue
deleted file mode 100644
index df89715..0000000
--- a/pages/analysis/auncel/auncel-weigh.vue
+++ /dev/null
@@ -1,839 +0,0 @@
-<template>
-  <view>
-    <u-navbar
-      title-color="#fff"
-      title-width="360"
-      back-icon-color="#ffffff"
-      :back-text-style="{ color: '#fff' }"
-      back-text="返回"
-      title="样品称重"
-      :border-bottom="false"
-      :custom-back="customBack"
-      :background="{ 'background-color': '#0055A2' }"
-    ></u-navbar>
-
-    <u-row class="content-title" gutter="16">
-      <u-col span="3">
-        <view class="content-title-name">
-          <text>待称重样品</text>
-        </view>
-        <u-gap height="10" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="6">
-        <view class="content-title-name">
-          <text>{{ currentAuncel.code === '' ? '电子天平' : currentAuncel.code }}</text>
-        </view>
-        <u-gap height="10" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="3">
-        <view class="content-title-name">
-          <text>已称重样品</text>
-        </view>
-        <u-gap height="10" bg-color="#0055A2"></u-gap>
-      </u-col>
-    </u-row>
-
-    <u-row gutter="16" class="content-main-height" align="top">
-      <u-col span="3">
-        <scroll-view scroll-y scroll-with-animation class="content-main-left" :scroll-top="scrollTop">
-          <view
-            v-for="(sample, index) in notWeighSampleList"
-            :key="index"
-            class="u-tab-item"
-            :class="[current == index ? 'u-tab-item-active' : '']"
-            :data-current="index"
-            @tap.stop="swichSample(index)"
-          >
-            <u-row gutter="20" style="width: 100%">
-              <u-col span="3" style="padding: 0rpx">
-                <view>
-                  <text>【{{ sample.sort }}】</text>
-                </view>
-              </u-col>
-              <u-col span="9">
-                <view>
-                  <text>{{ sample.sampleCode }}</text>
-                </view>
-                <view style="padding-top: 20rpx">
-                  <text>{{ sample.dataSourceType | getDataSourceTypeShow }}{{ sample.goodsName }}</text>
-                </view>
-              </u-col>
-            </u-row>
-          </view>
-        </scroll-view>
-        <view class="content-main-left-operation">
-          <u-row>
-            <u-col span="2"></u-col>
-            <u-col span="8">
-              <view>
-                <view style="padding: 20rpx; text-align: right">
-                  <text style="font-size: 30rpx; height: 50rpx">顺序称重：</text>
-                  <u-switch
-                    v-model="orderWeighChecked"
-                    active-color="#19be6b"
-                    inactive-color="#eee"
-                    @change="orderWeighChange"
-                  ></u-switch>
-                </view>
-              </view>
-            </u-col>
-            <u-col span="2"></u-col>
-          </u-row>
-        </view>
-      </u-col>
-      <u-col span="6">
-        <view class="content-main-height">
-          <view class="auncel-container">
-            <view class="auncel">
-              <view class="auncel-title">
-                <view style="padding-top: 40rpx; height: 100rpx; width: 100%; text-align: center">
-                  <text style="font-size: 44rpx; font-weight: 300"
-                    >【{{ currentSample.sort }}】 {{ currentSample.dataSourceType | getDataSourceTypeShow }}</text
-                  >
-                </view>
-
-                <view style="padding-top: 30rpx; height: 100rpx; width: 100%; text-align: center">
-                  <text style="font-size: 44rpx; font-weight: 300">{{ currentSample.sampleCode }}</text>
-                </view>
-                <view
-                  style="
-                    padding-top: 20rpx;
-                    padding-left: 140rpx;
-                    padding-right: 140rpx;
-                    display: flex;
-                    justify-content: center;
-                    align-content: center;
-                  "
-                >
-                  <block v-if="currentSample.dataSourceType">
-                    <u-row v-if="currentSample.dataSourceType == 2 || currentSample.dataSourceType == 3">
-                      <u-col span="1"></u-col>
-                      <u-col span="3">
-                        <u-input
-                          style="color: #3b4144; background-color: #ffffff"
-                          v-model="currentCupNum"
-                          type="number"
-                          border="border"
-                          :disabled="checkCupNumReadonly"
-                          placeholder="杯号"
-                        />
-                      </u-col>
-                      <u-col span="2">
-                        <text style="width: 100%; text-align: left">号杯</text>
-                      </u-col>
-                      <u-col span="4">
-                        <u-input
-                          style="color: #3b4144; background-color: #ffffff"
-                          v-model="currentSample.remarks"
-                          type="number"
-                          border="border"
-                          placeholder="样重比例"
-                        />
-                      </u-col>
-                      <u-col span="2">
-                        <text style="width: 100%; text-align: left">%</text>
-                      </u-col>
-                    </u-row>
-                    <u-row v-else>
-                      <u-col span="2"></u-col>
-                      <u-col span="7">
-                        <u-input
-                          style="color: #3b4144; background-color: #ffffff"
-                          v-model="currentCupNum"
-                          type="number"
-                          border="border"
-                          :disabled="checkCupNumReadonly"
-                          placeholder="杯号"
-                        />
-                      </u-col>
-                      <u-col span="3">
-                        <text style="width: 100%; text-align: left">号杯</text>
-                      </u-col>
-                    </u-row>
-                  </block>
-                </view>
-              </view>
-
-              <view class="auncel-weight">
-                <view class="weight">
-                  <view
-                    :class="
-                      currentAuncel.weightStable == 0
-                        ? 'weight-data-yellow'
-                        : currentAuncel.weightStable == 1
-                        ? 'weight-data'
-                        : 'weight-data-warning'
-                    "
-                    @click="selectAuncel"
-                  >
-                    {{ currentAuncel.weightData }}
-                  </view>
-                  <view class="weight-unit">{{ currentAuncel.weightUnit }}</view>
-                </view>
-              </view>
-            </view>
-          </view>
-          <view>
-            <view style="padding: 0rpx 60rpx 10rpx 60rpx">
-              <block v-if="currentAuncel.code !== ''">
-                <u-button
-                  style="height: 140rpx; font-size: 80rpx"
-                  type="success"
-                  :disabled="confirmWeightDisabled"
-                  shape="circle"
-                  @click="confirm"
-                  >确认采集</u-button
-                >
-              </block>
-            </view>
-          </view>
-        </view>
-      </u-col>
-      <u-col span="3">
-        <view class="content-main-height">
-          <scroll-view scroll-y scroll-with-animation class="content-main-right" :scroll-top="scrollTop">
-            <view
-              v-for="(sample, index) in finishWeighSampleList"
-              :key="index"
-              class="u-tab-item"
-              style="height: 240rpx"
-            >
-              <u-row gutter="20" style="width: 100%">
-                <u-col span="3" style="padding: 0rpx">
-                  <view>
-                    <text>【{{ sample.sort }}】</text>
-                  </view>
-                  <view style="padding-top: 20rpx">
-                    <text>{{ sample.cupNum }}号杯</text>
-                  </view>
-                  <view v-if="sample.remarks" style="padding-top: 20rpx">
-                    <text>{{ sample.remarks }}</text>
-                  </view>
-                </u-col>
-                <u-col span="9">
-                  <view>
-                    <text>{{ sample.sampleCode }}</text>
-                  </view>
-                  <view style="padding-top: 20rpx">
-                    <text>{{ sample.dataSourceType | getDataSourceTypeShow }}{{ sample.goodsName }}</text>
-                  </view>
-                  <view style="padding-top: 20rpx">
-                    <text style="padding-left: 20rpx">{{ sample.sampleWeight }} g</text>
-                    <u-button style="margin-left: 20rpx" size="mini" type="error" @click="weighRevoke(sample.id)"
-                      >撤销</u-button
-                    >
-                  </view>
-                </u-col>
-              </u-row>
-            </view>
-          </scroll-view>
-          <view class="content-main-right-operation">
-            <u-row>
-              <u-col span="2"></u-col>
-              <u-col span="8">
-                <u-button
-                  :disabled="finishWeighSampleList.length == 0"
-                  class="btn-operation"
-                  type="success"
-                  @click="submit"
-                  >立即提交</u-button
-                >
-              </u-col>
-              <u-col span="2"></u-col>
-            </u-row>
-          </view>
-        </view>
-      </u-col>
-    </u-row>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      scrollTop: 0, //tab标题的滚动条位置
-      current: 0, // 预设当前项的值
-      menuHeight: 0, // 左边菜单的高度
-      menuItemHeight: 0, // 左边菜单item的高度
-      orderWeighChecked: true, //顺序称重
-      weightDataIsToZero: false, //重量数据是否归零
-      currentCupNum: '',
-      currentSample: {}, //当前样品
-      currentTaskNo: '', //当前任务样品
-      currentTaskType: '', //当前任务类型
-      currentAuncel: {
-        id: '',
-        name: '',
-        code: '',
-        weightStable: 0,
-        weightData: '请选天平',
-        weightUnit: ''
-      },
-      allWeighSampleCount: 0,
-      notWeighSampleList: [],
-      finishWeighSampleList: []
-    }
-  },
-  computed: {
-    confirmWeightDisabled() {
-      if (
-        this.currentSample.sampleCode &&
-        this.currentAuncel.weightStable == 1 &&
-        Number(this.currentAuncel.weightData) > 0
-      ) {
-        return false
-      }
-      return true
-    },
-    checkCupNumReadonly() {
-      if (!this.currentAuncel || this.currentAuncel.id == '') return true
-      return false
-    }
-  },
-  onLoad(param) {
-    //console.log(param);
-    if (param.currentTaskNo) {
-      this.currentTaskNo = param.currentTaskNo
-      this.currentTaskType = param.currentTaskType
-    }
-    if (param.currentAuncelId) {
-      this.currentAuncel.id = param.currentAuncelId
-      this.currentAuncel.weightData = ''
-    }
-    if (param.currentAuncelName) {
-      this.currentAuncel.name = param.currentAuncelName
-    }
-    if (param.currentAuncelCode) {
-      this.currentAuncel.code = param.currentAuncelCode
-    }
-    this.getAssayTaskDetail(this.currentTaskNo)
-  },
-  onShow() {
-    console.log('onShow')
-
-    //注册websocket
-    let regData = {
-      msgId: this.$helper.uuid(),
-      cmd: 'register',
-      clientType: 'caaClient',
-      data: {
-        userId: this.userInfo.user_id,
-        tenantId: this.userInfo.tenant_id,
-        userRealName: this.userInfo.real_name
-      }
-    }
-    this.$measure.setRegData(JSON.stringify(regData))
-    this.$measure.reOpen()
-
-    //监听websocket返回来的数据
-    //设备数据
-    uni.$on('deviceData', res => {
-      switch (res.deviceType) {
-        case 'auncel':
-          //console.log(res);
-          if (this.currentAuncel.id === res.deviceId) {
-            this.currentAuncel.weightData = res.weightData
-            this.currentAuncel.weightUnit = res.weightUnit
-            this.currentAuncel.weightStable = res.weightStable
-            this.currentAuncel.isConnected = 1
-            if (Number(res.weightData) == 0) {
-              this.weightDataIsToZero = true
-            }
-          }
-          break
-        default:
-          break
-      }
-    })
-    //设备状态
-    uni.$on('deviceStatus', res => {
-      if (this.currentAuncel.id === res.deviceId) {
-        console.log(res)
-        if (res.connected == 0) {
-          this.currentAuncel.weightStable = 0
-          this.currentAuncel.weightData = '天平断开'
-          this.currentAuncel.weightUnit = ''
-        }
-      }
-      this.currentAuncel.isConnected = res.connected
-    })
-    //控制设备状态
-    uni.$on('controlDevice', res => {
-      if (this.currentAuncel.id === res.deviceId) {
-        console.log(res)
-
-        this.currentAuncel.id = ''
-        this.currentAuncel.name = ''
-        this.currentAuncel.code = ''
-        this.currentAuncel.weightStable = 0
-        this.currentAuncel.weightData = '请选天平'
-        this.currentAuncel.weightUnit = ''
-      }
-    })
-    //连接断开
-    uni.$on('connClose', res => {
-      //重置
-      this.currentAuncel.weightData = ''
-      this.currentAuncel.weightUnit = ''
-      this.currentAuncel.weightStable = 0
-      this.currentAuncel.controlUserName = ''
-      this.currentAuncel.isConnected = 0
-    })
-  },
-  onHide() {
-    console.log('onHide')
-    //移除监听websocket返回来的数据
-    uni.$off('deviceData')
-    uni.$off('deviceStatus')
-    uni.$off('controlDevice')
-    uni.$off('connClose')
-  },
-  onUnload() {
-    //取消控制
-    //发送控制请求
-    let controlDevice = {
-      msgId: this.currentAuncel.id,
-      cmd: 'controlDevice',
-      clientType: 'caaClient',
-      data: {
-        deviceId: this.currentAuncel.id,
-        isControl: false,
-        controlRealName: this.userInfo.username
-      }
-    }
-    //发送控制数据
-    this.$measure.send(JSON.stringify(controlDevice))
-  },
-  methods: {
-    //返回上一页
-    customBack() {
-      uni.redirectTo({
-        url: '/pages/sample/sample-weigh'
-      })
-    },
-    //切换样品
-    async swichSample(index) {
-      if (index == this.current) return
-      if (this.orderWeighChecked) return //顺序称重不允许选中
-      this.current = index
-      // 如果为0，意味着尚未初始化
-      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-        await this.getElRect('menu-scroll-view', 'menuHeight')
-        await this.getElRect('u-tab-item', 'menuItemHeight')
-      }
-      // 将菜单菜单活动item垂直居中
-      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2
-      this.currentSample = this.notWeighSampleList[index]
-    },
-    // 获取一个目标元素的高度
-    getElRect(elClass, dataVal) {
-      new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery().in(this)
-        query
-          .select('.' + elClass)
-          .fields({ size: true }, res => {
-            // 如果节点尚未生成，res值为null，循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass)
-              }, 10)
-              return
-            }
-            this[dataVal] = res.height
-          })
-          .exec()
-      })
-    },
-    confirm() {
-      //保存数据
-      if (!this.weightDataIsToZero) {
-        this.$helper.showToast({
-          title: '天平必须先回零！'
-        })
-        return
-      }
-      //获取当前重量
-      let weight = this.currentAuncel.weightData
-      //获取当前样品
-      let sample = this.notWeighSampleList[this.current]
-      //判断杯号
-      if (this.currentCupNum == null || typeof this.currentCupNum == 'undefined') this.currentCupNum = ''
-      if (this.currentCupNum === '') {
-        this.$helper.showToast({
-          title: '杯号不允许为空！'
-        })
-        return
-      }
-
-      if (this.current < this.notWeighSampleList.length - 1) {
-        this.currentSample = this.notWeighSampleList[this.current + 1]
-      }
-      //杯号
-      sample.cupNum = this.currentCupNum
-      //删除当前样品
-      this.notWeighSampleList.splice(this.current, 1)
-      //样品重量赋值
-      sample.sampleWeight = weight
-      //天平编号赋值
-      sample.auncelNo = this.currentAuncel.code
-      if (sample.remarks) {
-        sample.remarks = sample.remarks + '%'
-      }
-      this.$u.api
-        .auncelWeigh(sample)
-        .then(res => {
-          //this.finishWeighSampleList.push(sample);
-          //确认采集重量后，归零设为false
-          this.weightDataIsToZero = false
-          this.getAssayTaskDetail(this.currentTaskNo)
-          if (this.orderWeighChecked) {
-            this.current = 0
-          } else {
-            this.current = -1
-            this.currentSample = {}
-          }
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    },
-    submit() {
-      if (this.notWeighSampleList.length != 0) {
-        this.$helper.showToast({
-          title: '当前任务“' + this.currentTaskNo + '”尚未完成称重！'
-        })
-        return
-      }
-      uni.showModal({
-        title: '提示',
-        content: '确定提交数据？',
-        cancelColor: '#0055A2',
-        confirmColor: '#0055A2',
-        success: res => {
-          if (res.cancel) {
-            console.log('用户点击取消')
-            return
-          }
-          //显示loading
-          uni.showLoading({
-            title: '正在提交...'
-          })
-          this.$u.api
-            .weighBatchSubmitByTaskNo(this.currentTaskNo)
-            .then(res => {
-              this.$helper.showToast({
-                title: '提交成功！'
-              })
-              uni.redirectTo({
-                url: '/pages/sample/sample-weigh'
-              })
-              uni.hideLoading()
-            })
-            .catch(err => {
-              uni.hideLoading()
-              this.$helper.showToast({
-                title: '提交失败！'
-              })
-              console.log(err)
-            })
-        }
-      })
-      /**
-       if(this.currentTaskType == 4) { //临时样
-       let ids = [];
-       this.finishWeighSampleList.forEach(item => {
-       ids.push(item.id);
-       });
-
-       this.$u.api
-       .weighBatchSubmitByIds(ids.join(","))
-       .then(res => {
-       this.$helper.showToast({
-       title: '提交成功！'
-       });
-       })
-       .catch(err => {
-       this.showLoading = false;
-       console.log(err);
-       });
-       } else {//其他批量秤完提交
-       //if(this.allWeighSampleCount == this.finishWeighSampleList.length) {
-       console.log(this.notWeighSampleList)
-       if(this.notWeighSampleList.length == 0) {
-       this.$u.api
-       .weighBatchSubmitByTaskNo(this.currentTaskNo)
-       .then(res => {
-       this.$helper.showToast({
-       title: '提交成功！'
-       });
-       uni.redirectTo({
-       url: '/pages/sample/sample-weigh'
-       });
-       })
-       .catch(err => {
-       this.showLoading = false;
-       console.log(err);
-       });
-       } else {
-       this.$helper.showToast({
-       title: '当前任务“'+this.currentTaskNo+'”尚未完成称重！'
-       });
-       return;
-       }
-       }
-       **/
-    },
-    weighRevoke(id) {
-      uni.showModal({
-        title: '提示',
-        content: '确定撤销当前数据？',
-        cancelColor: '#0055A2',
-        confirmColor: '#0055A2',
-        success: res => {
-          if (!res.confirm) {
-            console.log('用户点击取消')
-            return
-          }
-          this.$u.api
-            .auncelWeighRevoke(id)
-            .then(res => {
-              this.getAssayTaskDetail(this.currentTaskNo)
-              if (this.orderWeighChecked) {
-                this.current = 0
-              } else {
-                this.current = -1
-                this.currentSample = {}
-              }
-            })
-            .catch(err => {
-              this.showLoading = false
-              console.log(err)
-            })
-        }
-      })
-    },
-    //自动生成杯号（仅顺序称重）：第一杯：手填，后续杯 = 上一杯 + 1
-    autoGenerateCupNum() {
-      if (!this.orderWeighChecked) return
-      //取上一杯
-      this.currentCupNum = ''
-      let preSample = null
-      if (this.finishWeighSampleList && this.finishWeighSampleList.length > 0) preSample = this.finishWeighSampleList[0]
-      if (preSample == null) {
-        return
-      }
-      const cupNum = preSample.cupNum
-      if (!isNaN(cupNum)) this.currentCupNum = Number(cupNum) + 1
-    },
-    getAssayTaskDetail(taskNo) {
-      this.notWeighSampleList = []
-      this.finishWeighSampleList = []
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
-        .then(res => {
-          let dataList = res.result
-          this.allWeighSampleCount = dataList.length
-          dataList.forEach((item, index) => {
-            if (item.weightSubmitStatus == 0) {
-              this.notWeighSampleList.push(item)
-            } else if (item.weightSubmitStatus == 1) {
-              this.finishWeighSampleList.unshift(item)
-              //this.finishWeighSampleList.push(item);
-            }
-          })
-          this.showLoading = false
-          //console.log(this.currentSample);
-          if (this.notWeighSampleList[0]) {
-            if (this.orderWeighChecked) {
-              this.current = 0
-              this.currentSample = this.notWeighSampleList[0]
-            } else {
-              this.current = -1
-              this.currentSample = {}
-            }
-          }
-          this.autoGenerateCupNum() //计算生成当前杯号
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    },
-    selectAuncel() {
-      if (this.currentAuncel.weightData === '请选天平') {
-        uni.navigateTo({
-          url:
-            '/pages/auncel/auncel-select?currentTaskNo=' +
-            this.currentTaskNo +
-            '&currentTaskType=' +
-            this.currentTaskType
-        })
-      }
-    },
-    orderWeighChange(e) {
-      if (e && this.notWeighSampleList.length > 0) {
-        //this.current = 0;
-        //this.currentSample = this.notWeighSampleList[0];
-        this.getAssayTaskDetail(this.currentTaskNo)
-        return
-      }
-      this.current = -1
-      this.currentSample = {}
-    }
-  },
-  filters: {
-    getDataSourceTypeShow(val) {
-      if (val == 2) return '【筛上】'
-      if (val == 3) return '【筛下】'
-      return ''
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.content-title {
-  height: 110rpx;
-  width: 100%;
-  font-size: 46rpx;
-  font-weight: 300;
-}
-
-.content-title-name {
-  padding: 20rpx;
-  text-align: center;
-}
-
-.content-main-height {
-  height: calc(100vh - 250rpx);
-}
-
-.content-main-left {
-  height: calc(100vh - 410rpx);
-  background-color: #f6f6f6;
-}
-
-.u-tab-item {
-  height: 160rpx;
-  background: #f6f6f6;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 36rpx;
-  color: #444;
-  font-weight: 400;
-  line-height: 1;
-  border-width: 4rpx;
-  border-bottom: dotted;
-}
-
-.u-tab-item-active {
-  position: relative;
-  color: #0055a2;
-  font-size: 36rpx;
-  font-weight: 600;
-  background: #fff;
-}
-
-.u-tab-item-active::before {
-  content: '';
-  position: absolute;
-
-  height: 32rpx;
-  left: 0;
-  top: 39rpx;
-}
-
-.content-main-left-operation {
-  height: 160rpx;
-  padding-top: 30rpx;
-}
-
-.content-main-right {
-  height: calc(100vh - 410rpx);
-}
-
-.content-main-right-operation {
-  height: 160rpx;
-  padding-top: 30rpx;
-}
-
-.btn-operation {
-  height: 100rpx;
-  font-size: 36rpx;
-}
-
-.auncel-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.auncel {
-  width: 800rpx;
-  height: 800rpx;
-  background-image: url(../../static/images/auncel.png);
-  background-repeat: no-repeat;
-  background-size: 100%;
-}
-
-.auncel-title {
-  width: 100%;
-  height: 420rpx;
-}
-
-.auncel-weight {
-  padding: 40rpx;
-}
-
-.weight {
-  width: 100%;
-  min-width: 200px;
-  height: 200rpx;
-  padding: 0 30rpx;
-  display: flex;
-  flex-direction: row;
-  //background-color: #2c405a;
-}
-
-.weight-data {
-  flex-grow: 1;
-  height: 100%;
-  color: #4cd964;
-  text-align: right;
-  line-height: 200rpx;
-  letter-spacing: 4rpx;
-  font-size: 150rpx;
-  font-family: zzjc-lcd;
-}
-
-.weight-data-yellow {
-  flex-grow: 1;
-  height: 100%;
-  color: #ffff00;
-  text-align: right;
-  line-height: 200rpx;
-  letter-spacing: 4rpx;
-  font-size: 150rpx;
-  font-family: zzjc-lcd;
-}
-
-.weight-data-warning {
-  flex-grow: 1;
-  height: 100%;
-  color: #ff3333;
-  text-align: right;
-  line-height: 200rpx;
-  font-size: 150rpx;
-  font-family: zzjc-lcd;
-}
-
-.weight-unit {
-  color: #ffffff;
-  font-size: 130rpx;
-  line-height: 200rpx;
-  padding-left: 20rpx;
-}
-</style>
diff --git a/pages/analysis/sample/sample-look.vue b/pages/analysis/sample/sample-look.vue
deleted file mode 100644
index df7b44c..0000000
--- a/pages/analysis/sample/sample-look.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <view>
-    <navbar-back :autoBack="false" title="任 务 单" @leftClick="customBack"></navbar-back>
-    <u-row class="content-title" gutter="16">
-      <u-col span="4">
-        <view class="content-title-name">
-          <text>任务列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="8">
-        <view class="content-title-name">
-          <text>样品列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-    </u-row>
-    <u-row class="content-main-height" gutter="16" align="top">
-      <u-col span="4">
-        <scroll-view
-          scroll-y
-          scroll-with-animation
-          class="content-main-height content-main-left"
-          :scroll-top="scrollTop"
-        >
-          <view
-            v-for="(task, index) in taskList"
-            :key="index"
-            class="u-tab-item"
-            :class="[current == index ? 'u-tab-item-active' : '']"
-            :data-current="index"
-            @tap.stop="swichTask(index)"
-          >
-            <u-row style="width: 100%">
-              <u-col span="2" style="text-align: center">
-                <u-icon name="tags-fill" size="34"></u-icon>
-              </u-col>
-              <u-col span="10">
-                <view>
-                  <text style="font-size: 42rpx">{{ task.taskNo }}</text>
-                </view>
-                <view style="margin-top: 20rpx">
-                  <text>{{ task.taskName }}</text>
-                </view>
-                <view class="x-f" style="margin-top: 20rpx">
-                  <u-icon color="" name="clock"></u-icon>
-                  <text style="margin-left: 10rpx">{{ task.taskOperTime }}</text>
-                </view>
-              </u-col>
-            </u-row>
-          </view>
-        </scroll-view>
-      </u-col>
-      <u-col span="8">
-        <view class="content-main-height">
-          <scroll-view scroll-y scroll-with-animation class="content-main-height">
-            <block v-for="(sample, index) in sampleList" :key="index">
-              <view
-                v-if="index == 0 || (index > 0 && sampleList[index].sort != sampleList[index - 1].sort)"
-                style="padding: 10rpx; font-size: 36rpx"
-              >
-                <u-row>
-                  <u-col span="2" style="text-align: center">
-                    <view>
-                      <text>【{{ sample.sort }}】</text>
-                    </view>
-                  </u-col>
-                  <u-col span="10">
-                    <view>
-                      <text style="padding-left: 20rpx">{{ sample.sampleCode }}</text>
-                    </view>
-                    <view>
-                      <text style="padding-left: 20rpx">{{ sample.sampleName }}</text>
-                    </view>
-                  </u-col>
-                </u-row>
-                <u-line style="padding: 10rpx" color="#bbb" />
-              </view>
-            </block>
-          </scroll-view>
-        </view>
-      </u-col>
-    </u-row>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      scrollTop: 0, //tab标题的滚动条位置
-      current: 0, // 预设当前项的值
-      menuHeight: 0, // 左边菜单的高度
-      menuItemHeight: 0, // 左边菜单item的高度
-      taskList: [],
-      sampleList: []
-    }
-  },
-  onLoad() {
-    //获取任务列表
-    this.getAssayTask()
-  },
-  methods: {
-    //返回首页
-    customBack() {
-      uni.reLaunch({
-        url: '/pages/analysis/index/index'
-      })
-    },
-    //切换任务
-    async swichTask(index) {
-      if (index == this.current) return
-      this.current = index
-      // 如果为0，意味着尚未初始化
-      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-        await this.getElRect('menu-scroll-view', 'menuHeight')
-        await this.getElRect('u-tab-item', 'menuItemHeight')
-      }
-      // 将菜单菜单活动item垂直居中
-      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2
-
-      //获取任务详情
-      this.getAssayTaskDetail(this.taskList[index].taskNo)
-    },
-    // 获取一个目标元素的高度
-    getElRect(elClass, dataVal) {
-      new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery().in(this)
-        query
-          .select('.' + elClass)
-          .fields({ size: true }, res => {
-            // 如果节点尚未生成，res值为null，循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass)
-              }, 10)
-              return
-            }
-            this[dataVal] = res.height
-          })
-          .exec()
-      })
-    },
-    getAssayTask() {
-      //显示loading
-      uni.showLoading({
-        title: '加载中...'
-      })
-      const param = {
-        assayOper: this.userInfo.realname,
-        operateType: 'task'
-      }
-      this.$u.api
-        .getAssayTaskList(param)
-        .then(res => {
-          this.taskList = res.result
-          if (this.taskList && this.taskList.length > 0) {
-            this.getAssayTaskDetail(this.taskList[0].taskNo)
-          } else {
-            uni.hideLoading()
-          }
-        })
-        .catch(err => {
-          uni.hideLoading()
-          console.log(err)
-        })
-    },
-    getAssayTaskDetail(taskNo) {
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
-        .then(res => {
-          this.sampleList = res.result
-          uni.hideLoading()
-        })
-        .catch(err => {
-          uni.hideLoading()
-          console.log(err)
-        })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.content-title {
-  height: 110rpx;
-  width: 100%;
-  font-size: 46rpx;
-  font-weight: 300;
-}
-
-.content-title-name {
-  padding: 20rpx;
-  text-align: center;
-}
-
-.content-main-height {
-  height: calc(100vh - 250rpx);
-}
-
-.content-main-left {
-  background-color: #f6f6f6;
-}
-
-.u-tab-item {
-  padding: 10rpx;
-  height: 200rpx;
-  background: #f6f6f6;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 36rpx;
-  color: #444;
-  font-weight: 400;
-  line-height: 1;
-  border-width: 4rpx;
-  border-bottom: dotted;
-}
-
-.u-tab-item-active {
-  position: relative;
-  color: #0055a2;
-  font-size: 36rpx;
-  font-weight: 600;
-  background: #fff;
-}
-
-.u-tab-item-active::before {
-  content: '';
-  position: absolute;
-
-  height: 32rpx;
-  left: 0;
-  top: 39rpx;
-}
-</style>
diff --git a/pages/analysis/sample/sample-review.vue b/pages/analysis/sample/sample-review.vue
deleted file mode 100644
index 21f8d0b..0000000
--- a/pages/analysis/sample/sample-review.vue
+++ /dev/null
@@ -1,423 +0,0 @@
-<template>
-  <view>
-    <navbar-back :autoBack="false" title="样重复核" @leftClick="customBack"></navbar-back>
-    <u-row class="content-title" gutter="16">
-      <u-col span="4">
-        <view class="content-title-name">
-          <text>任务列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="8">
-        <view class="content-title-name">
-          <text>样品列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-    </u-row>
-    <u-row class="content-main-height" gutter="16" align="top">
-      <u-col span="4">
-        <scroll-view
-          scroll-y
-          scroll-with-animation
-          class="content-main-height content-main-left"
-          :scroll-top="scrollTop"
-        >
-          <view
-            v-for="(task, index) in taskList"
-            :key="index"
-            class="u-tab-item"
-            :class="[current == index ? 'u-tab-item-active' : '']"
-            :data-current="index"
-            @tap.stop="swichTask(index)"
-          >
-            <u-row style="width: 100%">
-              <u-col span="2" style="text-align: center">
-                <u-icon name="tags-fill" size="34"></u-icon>
-              </u-col>
-              <u-col span="10">
-                <view>
-                  <text style="font-size: 42rpx">{{ task.taskNo }}</text>
-                </view>
-                <view style="margin-top: 20rpx">
-                  <text>{{ task.taskName }}</text>
-                </view>
-                <view class="x-f" style="margin-top: 20rpx">
-                  <u-icon name="clock"></u-icon>
-                  <text style="margin-left: 10rpx">{{ task.taskOperTime }}</text>
-                </view>
-              </u-col>
-            </u-row>
-          </view>
-        </scroll-view>
-      </u-col>
-      <u-col span="8">
-        <view class="content-main-height">
-          <scroll-view scroll-y scroll-with-animation class="content-main-right">
-            <u-checkbox-group @change="checkboxGroupChange" style="width: 100%">
-              <block v-for="(sample, index) in sampleList" :key="index">
-                <view style="width: 100%; padding: 10rpx; font-size: 36rpx">
-                  <u-row>
-                    <u-col span="2" style="text-align: center">
-                      <view>
-                        <text>【{{ sample.sort }}】</text>
-                      </view>
-                    </u-col>
-                    <u-col span="4">
-                      <view>
-                        <text style="padding-left: 20rpx">{{ sample.sampleCode }}</text>
-                      </view>
-                      <view>
-                        <text style="padding-left: 20rpx"
-                          >{{ sample.dataSourceType | getDataSourceTypeShow }}{{ sample.sampleName }}</text
-                        >
-                      </view>
-                      <view>
-                        <text v-if="sample.sampleWeight" style="padding-left: 20rpx">{{ sample.sampleWeight }} g</text>
-                      </view>
-                    </u-col>
-                    <u-col span="4">
-                      <view>
-                        <text style="padding-left: 20rpx">{{ sample.cupNum }}号杯</text>
-                      </view>
-                      <view>
-                        <text style="padding-left: 20rpx">{{ sample.remarks }}</text>
-                      </view>
-                      <view>
-                        <text style="padding-left: 20rpx">{{ sample.measureTime | getWeightTimeShow }}</text>
-                      </view>
-                    </u-col>
-                    <u-col span="2">
-                      <view>
-                        <u-checkbox
-                          @change="checkboxChange"
-                          v-model="sample.checked"
-                          :label="sample.id"
-                          :name="sample.id"
-                        >
-                        </u-checkbox>
-                        <!-- <block v-if="sample.reviewCount > 0 && sample.weightSubmitStatus == 0">
-                            <u-button
-                                type="warning"
-                                @click="recovery(sample.id)"
-                            >恢复</u-button>
-                        </block>
-                        <block v-else>
-                            <u-button
-                                type="default"
-                                @click="review(sample.id)"
-                            >复核</u-button>
-                        </block> -->
-                      </view>
-                    </u-col>
-                  </u-row>
-                  <u-line style="padding: 10rpx" color="#bbb" />
-                </view>
-              </block>
-            </u-checkbox-group>
-          </scroll-view>
-          <view class="content-main-right-operation">
-            <u-row>
-              <u-col span="4"><!-- <u-button class="btn-operation" type="primary">原始记录单打印</u-button> --></u-col>
-              <u-col span="4"
-                ><!-- <u-button class="btn-operation" :disabled="reviewNum > 0"  type="success" >数据上报</u-button> --></u-col
-              >
-              <u-col span="4">
-                <!-- <u-button class="btn-operation" :disabled="reviewNum == 0" type="warning" @click="taskReview">任务单退回复核</u-button> -->
-                <u-button class="btn-operation" :disabled="reviewList.length <= 0" type="warning" @click="taskReviewAll"
-                  >任务单退回复核</u-button
-                >
-              </u-col>
-            </u-row>
-          </view>
-        </view>
-      </u-col>
-    </u-row>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      scrollTop: 0, //tab标题的滚动条位置
-      current: 0, // 预设当前项的值
-      menuHeight: 0, // 左边菜单的高度
-      menuItemHeight: 0, // 左边菜单item的高度
-      currentTaskId: '', //当前选择的任务单id
-      currentTaskNo: '', //当前选中的任务编号
-      reviewNum: 0, //复核数
-      reviewList: [],
-      taskList: [],
-      sampleList: []
-    }
-  },
-  onLoad(param) {
-    if (param.currentTaskNo) {
-      this.currentTaskNo = param.currentTaskNo
-    }
-    //获取任务列表
-    this.getAssayTask()
-  },
-  methods: {
-    //返回上一页
-    customBack() {
-      uni.redirectTo({
-        url: '/pages/analysis/sample/sample-report'
-      })
-    },
-    //开始秤样
-    startWeighSample() {
-      uni.navigateTo({
-        url: '/pages/auncel/auncel-weigh'
-      })
-    },
-    //切换任务
-    async swichTask(index) {
-      if (index == this.current) return
-      this.current = index
-      // 如果为0，意味着尚未初始化
-      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-        await this.getElRect('menu-scroll-view', 'menuHeight')
-        await this.getElRect('u-tab-item', 'menuItemHeight')
-      }
-      // 将菜单菜单活动item垂直居中
-      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2
-
-      //获取任务详情
-      this.currentTaskNo = this.taskList[index].taskNo
-      this.currentTaskId = this.taskList[index].id
-      this.getAssayTaskDetail(this.currentTaskNo)
-    },
-    // 获取一个目标元素的高度
-    getElRect(elClass, dataVal) {
-      new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery().in(this)
-        query
-          .select('.' + elClass)
-          .fields({ size: true }, res => {
-            // 如果节点尚未生成，res值为null，循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass)
-              }, 10)
-              return
-            }
-            this[dataVal] = res.height
-          })
-          .exec()
-      })
-    },
-    getAssayTask() {
-      //显示loading
-      uni.showLoading({
-        title: '加载中...'
-      })
-      // this.$u.api
-      //     .getAssayTaskListBy({taskStatus:2})
-      const param = {
-        operateType: 'review',
-        taskNo: this.currentTaskNo
-      }
-      this.$u.api
-        .getAssayTaskList(param)
-        .then(res => {
-          this.taskList = res.result
-          this.currentTaskNo = this.taskList[0].taskNo
-          this.currentTaskId = this.taskList[0].id
-          this.getAssayTaskDetail(this.currentTaskNo)
-          uni.hideLoading()
-        })
-        .catch(err => {
-          uni.hideLoading()
-          console.log(err)
-        })
-    },
-    getAssayTaskDetail(taskNo) {
-      this.reviewNum = 0
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
-        .then(res => {
-          this.sampleList = res.result
-          this.showLoading = false
-
-          //统计需要复核的数量
-          this.sampleList.forEach(item => {
-            if (item.reviewCount > 0 && item.weightSubmitStatus == 0) {
-              item.checked = true
-              this.reviewNum += 1
-            }
-          })
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    },
-    review(id) {
-      this.$u.api
-        .assayTaskDetailReview(id)
-        .then(res => {
-          this.getAssayTaskDetail(this.currentTaskNo)
-          this.showLoading = false
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    },
-    recovery(id) {
-      this.$u.api
-        .assayTaskDetailRecovery(id)
-        .then(res => {
-          this.getAssayTaskDetail(this.currentTaskNo)
-          this.showLoading = false
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    },
-    //任务单退回复核
-    taskReview() {
-      this.$u.api
-        .assayTaskReview(this.currentTaskId)
-        .then(res => {
-          this.showLoading = false
-
-          uni.redirectTo({
-            url: '/pages/sample/sample-report'
-          })
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    },
-    //任务单及样品退回复核
-    taskReviewAll() {
-      uni.showModal({
-        title: '提示',
-        content: '确定复核当前选中的样品？',
-        cancelColor: '#0055A2',
-        confirmColor: '#0055A2',
-        success: res => {
-          if (res.cancel) {
-            console.log('用户点击取消')
-            return
-          }
-          console.log('确定。。。')
-          //显示loading
-          uni.showLoading({
-            title: '退回中...'
-          })
-          this.$u.api
-            .reviewWeightTaskByTaskIdAndSampleIds(this.currentTaskId, this.reviewList.join(','))
-            .then(res => {
-              uni.hideLoading()
-              uni.redirectTo({
-                url: '/pages/sample/sample-report'
-              })
-            })
-            .catch(err => {
-              uni.hideLoading()
-              console.log(err)
-            })
-        }
-      })
-    },
-    checkboxGroupChange(v) {
-      this.reviewList = v
-      this.reviewNum = v.length
-      //console.log('group change', v);
-    },
-    checkboxChange(e) {
-      /* if(e.value) {
-          this.review(e.name);
-      } else {
-          this.recovery(e.name);
-      } */
-    }
-  },
-  filters: {
-    getWeightTimeShow(time) {
-      if (time == null) return ''
-      return time.split(' ')[1]
-    },
-    getDataSourceTypeShow(val) {
-      if (val == 2) return '【筛上】'
-      if (val == 3) return '【筛下】'
-      return ''
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.content-title {
-  height: 110rpx;
-  width: 100%;
-  font-size: 46rpx;
-  font-weight: 300;
-}
-
-.content-title-name {
-  padding: 20rpx;
-  text-align: center;
-}
-
-.content-main-height {
-  height: calc(100vh - 250rpx);
-}
-
-.content-main-left {
-  background-color: #f6f6f6;
-}
-
-.u-tab-item {
-  padding: 10rpx;
-  height: 200rpx;
-  background: #f6f6f6;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 36rpx;
-  color: #444;
-  font-weight: 400;
-  line-height: 1;
-  border-width: 4rpx;
-  border-bottom: dotted;
-}
-
-.u-tab-item-active {
-  position: relative;
-  color: #0055a2;
-  font-size: 36rpx;
-  font-weight: 600;
-  background: #fff;
-}
-
-.u-tab-item-active::before {
-  content: '';
-  position: absolute;
-
-  height: 32rpx;
-  left: 0;
-  top: 39rpx;
-}
-
-.content-main-right {
-  height: calc(100vh - 410rpx);
-}
-
-.content-main-right-operation {
-  height: 160rpx;
-  padding-top: 30rpx;
-}
-
-.btn-operation {
-  height: 100rpx;
-  font-size: 36rpx;
-}
-</style>
diff --git a/pages/analysis/sample/sample-send.vue b/pages/analysis/sample/sample-send.vue
deleted file mode 100644
index 3e67ddf..0000000
--- a/pages/analysis/sample/sample-send.vue
+++ /dev/null
@@ -1,425 +0,0 @@
-<!--送样-->
-<template>
-  <view class="page">
-    <navbar-back :autoBack="false" title="样品分析-送样" @leftClick="customBack"></navbar-back>
-    <u-row class="content-title" gutter="16">
-      <u-col span="4">
-        <view class="content-title-name">
-          <text>任务列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="8">
-        <view class="content-title-name">
-          <text>样品列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-    </u-row>
-    <u-row class="content-main-height" gutter="16" align="top">
-      <u-col span="4">
-        <scroll-view
-          scroll-y
-          scroll-with-animation
-          class="content-main-height content-main-left"
-          :scroll-top="scrollTop"
-        >
-          <view
-            v-for="(task, index) in taskList"
-            :key="index"
-            class="u-tab-item"
-            :class="[current == index ? 'u-tab-item-active' : '']"
-            :data-current="index"
-            @tap.stop="swichTask(index)"
-          >
-            <u-row style="width: 100%">
-              <u-col span="2" style="text-align: center">
-                <u-icon :color="taskStyle(task)" name="tags-fill" size="34"></u-icon>
-              </u-col>
-              <u-col span="10">
-                <view>
-                  <text style="font-size: 42rpx">{{ task.taskNo }}</text>
-                </view>
-                <view style="margin-top: 20rpx">
-                  <text>{{ task.taskName }}</text>
-                </view>
-                <view class="x-f" style="margin-top: 20rpx">
-                  <u-icon color="" name="clock"></u-icon>
-                  <text style="margin-left: 10rpx">{{ task.taskOperTime }}</text>
-                </view>
-              </u-col>
-            </u-row>
-          </view>
-        </scroll-view>
-      </u-col>
-      <u-col span="8">
-        <view class="content-main-height">
-          <scroll-view scroll-y scroll-with-animation class="content-main-right">
-            <block v-for="(sample, index) in sampleList" :key="index">
-              <view style="padding: 10rpx; font-size: 36rpx">
-                <u-row>
-                  <u-col span="3" style="text-align: center">
-                    <view>
-                      <text>【{{ sample.sort }}】</text>
-                    </view>
-                    <!--                    <u-row>-->
-                    <!--                      <u-col span="6" style="text-align: center;">-->
-                    <!--                        <u-checkbox v-model="sample.checked" v-if="sample.sampleProcessNo == 'F39'" @change="selectSample(sample)"></u-checkbox>-->
-                    <!--                      </u-col>-->
-                    <!--                      <u-col span="6" style="text-align: center;">-->
-                    <!--                        -->
-                    <!--                      </u-col>-->
-                    <!--                    </u-row>-->
-                  </u-col>
-                  <u-col span="9" class="sample_desc">
-                    <view>
-                      <view>
-                        <text style="padding-left: 20rpx">{{ sample.sampleCode }}</text>
-                      </view>
-                      <view>
-                        <text style="padding-left: 20rpx"
-                          >{{ sample.dataSourceType | getDataSourceTypeShow }}{{ sample.sampleName }}</text
-                        >
-                      </view>
-                    </view>
-                    <view class="sample_desc_warn" v-if="sample.sampleProcessNo != 'F39'">
-                      状态异常：{{ sample.sampleProcessNo }}
-                    </view>
-                  </u-col>
-                </u-row>
-                <u-line style="padding: 10rpx" color="#bbb" />
-              </view>
-            </block>
-          </scroll-view>
-          <view class="content-main-right-operation">
-            <u-row>
-              <u-col span="4"></u-col>
-              <u-col span="4"></u-col>
-              <u-col span="4">
-                <u-button
-                  class="btn-operation"
-                  :disabled="this.taskList.length <= 0"
-                  type="success"
-                  @click="confirmReceipt"
-                  >确认送样</u-button
-                >
-              </u-col>
-            </u-row>
-          </view>
-        </view>
-      </u-col>
-    </u-row>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      scrollTop: 0, //tab标题的滚动条位置
-      current: 0, // 预设当前项的值
-      menuHeight: 0, // 左边菜单的高度
-      menuItemHeight: 0, // 左边菜单item的高度
-      currentTask: '', //当前选中任务
-      currentTaskNo: '', //当前选中的任务编号
-      currentTaskType: '', //当前任务类型
-      taskList: [],
-      sampleList: []
-    }
-  },
-  onLoad() {
-    //获取任务列表
-    this.getAssayTask()
-  },
-  methods: {
-    //返回首页
-    customBack() {
-      uni.reLaunch({
-        url: '/pages/analysis/index/index'
-      })
-    },
-    selectSample(sample) {
-      if (sample.checked) sample.checked = false
-      else sample.checked = true
-    },
-    taskStyle(task) {
-      if (task.weightTaskStatus == 0 && task.reviewCount > 0) {
-        return 'red'
-      }
-      if (task.weightTaskStatus == 1 && task.reviewCount > 0) {
-        return 'red'
-      }
-      if (task.weightTaskStatus == 2 && task.reviewCount > 0) {
-        return 'green'
-      }
-      return ''
-    },
-    sampleStyle(sample) {
-      //console.log(sample);
-      if (sample.weightSubmitStatus == 0 && sample.reviewCount > 0) {
-        return 'color: red'
-      }
-      if (sample.weightSubmitStatus == 1 && sample.reviewCount > 0) {
-        //return 'color: #e0861a';
-        return 'color: green'
-      }
-      if (sample.weightSubmitStatus == 2 && sample.reviewCount > 0) {
-        return 'color: green'
-      }
-      return ''
-    },
-    //确认送样
-    confirmReceipt() {
-      //检查是否选中所有
-      // let checkedSampleList = this.sampleList.filter(item => item.checked);
-      // if (checkedSampleList.length != this.sampleList.length) {
-      //   this.$helper.showToast({
-      //     title: '样品未全部勾选，请检查！'
-      //   });
-      //   return;
-      // }
-      //检查是否所有样品都在F39
-      const checkList = this.sampleList.filter(item => item.sampleProcessNo != 'F39')
-      if (checkList.length > 0) {
-        this.$helper.showToast({
-          title: '部分样品状态异常，请联系技术支持人员处理！'
-        })
-        return
-      }
-      const checkedSampleList = this.sampleList
-      uni.showModal({
-        title: '提示',
-        content: '确认送样？',
-        cancelColor: '#0055A2',
-        confirmColor: '#0055A2',
-        success: res => {
-          if (res.cancel) {
-            return
-          }
-          const sampleIdList = checkedSampleList.map(item => item.busSubCsampleId)
-          const data = {
-            busAssayTaskId: this.currentTask.id,
-            sampleSourceType: 2,
-            sampleProcessNo: 'F39',
-            isGenSampleHandover: false,
-            sampleIdList: sampleIdList
-          }
-          uni.showLoading({
-            title: '正在提交...'
-          })
-          this.$u.api
-            .execSendSample(data)
-            .then(res => {
-              let msg = '发生错误，请稍后再试！'
-              if (!res.success) {
-                if (res.message) {
-                  msg = res.message
-                }
-                this.$helper.showToast({
-                  title: msg
-                })
-                return
-              }
-              this.$helper.showToast({
-                title: '操作成功！'
-              })
-              this.getAssayTask()
-            })
-            .catch(err => {
-              this.$helper.showToast({
-                title: '提交失败！'
-              })
-              console.log(err)
-            })
-            .finally(() => {
-              uni.hideLoading()
-            })
-        }
-      })
-    },
-    //切换任务
-    async swichTask(index) {
-      if (index == this.current) return
-      this.current = index
-      // 如果为0，意味着尚未初始化
-      // if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-      //   await this.getElRect('menu-scroll-view', 'menuHeight');
-      //   await this.getElRect('u-tab-item', 'menuItemHeight');
-      // }
-      // // 将菜单菜单活动item垂直居中
-      // this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
-
-      //获取任务详情
-      this.currentTask = this.taskList[index]
-      this.currentTaskNo = this.taskList[index].taskNo
-      this.currentTaskType = this.taskList[index].taskType
-      this.getAssayTaskDetail(this.currentTaskNo)
-    },
-    // 获取一个目标元素的高度
-    getElRect(elClass, dataVal) {
-      new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery().in(this)
-        query
-          .select('.' + elClass)
-          .fields({ size: true }, res => {
-            // 如果节点尚未生成，res值为null，循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass)
-              }, 10)
-              return
-            }
-            this[dataVal] = res.height
-          })
-          .exec()
-      })
-    },
-    getAssayTask() {
-      //显示loading
-      uni.showLoading({
-        title: '加载中...'
-      })
-      const param = {
-        operateType: 'send',
-        assayOper: this.userInfo.realname
-      }
-      this.$u.api
-        .getAssayTaskList(param)
-        .then(res => {
-          this.taskList = res.result
-          if (!this.taskList || this.taskList.length == 0) {
-            this.sampleList = []
-            return
-          }
-          if (this.taskList && this.taskList.length > 0) {
-            this.current = 0
-            this.currentTask = this.taskList[0]
-            this.currentTaskNo = this.taskList[0].taskNo
-            this.currentTaskType = this.taskList[0].taskType
-            this.getAssayTaskDetail(this.currentTaskNo)
-          }
-        })
-        .catch(err => {
-          console.log(err)
-        })
-        .finally(() => {
-          uni.hideLoading()
-        })
-    },
-    getAssayTaskDetail(taskNo) {
-      uni.showLoading({
-        title: '加载中...'
-      })
-      const param = {
-        taskNo: taskNo,
-        waiting_receive: '1' //标记是收样
-      }
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo(param)
-        .then(res => {
-          const list = res.result
-          list.forEach(item => {
-            item.checked = false
-          })
-          this.sampleList = list
-          this.showLoading = false
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-        .finally(() => {
-          uni.hideLoading()
-        })
-    }
-  },
-  filters: {
-    getDataSourceTypeShow(val) {
-      if (val == 2) return '【筛上】'
-      if (val == 3) return '【筛下】'
-      return ''
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.content-title {
-  height: 110rpx;
-  width: 100%;
-  font-size: 46rpx;
-  font-weight: 300;
-}
-
-.content-title-name {
-  padding: 20rpx;
-  text-align: center;
-}
-
-.content-main-height {
-  height: calc(100vh - 250rpx);
-}
-
-.content-main-left {
-  background-color: #f6f6f6;
-}
-
-.u-tab-item {
-  padding: 10rpx;
-  height: 200rpx;
-  background: #f6f6f6;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 36rpx;
-  color: #444;
-  font-weight: 400;
-  line-height: 1;
-  border-width: 4rpx;
-  border-bottom: dotted;
-}
-
-.u-tab-item-active {
-  position: relative;
-  color: #0055a2;
-  font-size: 36rpx;
-  font-weight: 600;
-  background: #fff;
-}
-
-.u-tab-item-active::before {
-  content: '';
-  position: absolute;
-
-  height: 32rpx;
-  left: 0;
-  top: 39rpx;
-}
-
-.content-main-right {
-  height: calc(100vh - 410rpx);
-}
-
-.content-main-right-operation {
-  height: 160rpx;
-  padding-top: 30rpx;
-}
-
-.btn-operation {
-  height: 100rpx;
-  font-size: 36rpx;
-}
-
-.sample_desc {
-  width: 100%;
-  display: flex;
-  flex-wrap: nowrap; /* 禁止换行 */
-  justify-content: space-between !important;
-  padding-right: 15px !important;
-}
-
-.sample_desc_warn {
-  color: red;
-}
-</style>
diff --git a/pages/analysis/sample/sample-weigh.vue b/pages/analysis/sample/sample-weigh.vue
deleted file mode 100644
index 21580b0..0000000
--- a/pages/analysis/sample/sample-weigh.vue
+++ /dev/null
@@ -1,319 +0,0 @@
-<template>
-  <view class="page">
-    <navbar-back :autoBack="false" title="样品称重" @leftClick="customBack"></navbar-back>
-    <u-row class="content-title" gutter="16">
-      <u-col span="4">
-        <view class="content-title-name">
-          <text>任务列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-      <u-col span="8">
-        <view class="content-title-name">
-          <text>样品列表</text>
-        </view>
-        <u-gap height="5" bg-color="#0055A2"></u-gap>
-      </u-col>
-    </u-row>
-    <u-row class="content-main-height" gutter="16" align="top">
-      <u-col span="4">
-        <scroll-view
-          scroll-y
-          scroll-with-animation
-          class="content-main-height content-main-left"
-          :scroll-top="scrollTop"
-        >
-          <view
-            v-for="(task, index) in taskList"
-            :key="index"
-            class="u-tab-item"
-            :class="[current == index ? 'u-tab-item-active' : '']"
-            :data-current="index"
-            @tap.stop="swichTask(index)"
-          >
-            <u-row style="width: 100%">
-              <u-col span="2" style="text-align: center">
-                <u-icon :color="taskStyle(task)" name="tags-fill" size="34"></u-icon>
-              </u-col>
-              <u-col span="10">
-                <view>
-                  <text style="font-size: 42rpx">{{ task.taskNo }}</text>
-                </view>
-                <view style="margin-top: 20rpx">
-                  <text>{{ task.taskName }}</text>
-                </view>
-                <view class="x-f" style="margin-top: 20rpx">
-                  <u-icon name="clock"></u-icon>
-                  <text style="margin-left: 10rpx">{{ task.taskOperTime }}</text>
-                </view>
-              </u-col>
-            </u-row>
-          </view>
-        </scroll-view>
-      </u-col>
-      <u-col span="8">
-        <view class="content-main-height">
-          <scroll-view scroll-y scroll-with-animation class="content-main-right">
-            <block v-for="(sample, index) in sampleList" :key="index">
-              <view v-if="currentTask.reviewCount == sample.reviewCount" style="padding: 10rpx; font-size: 36rpx">
-                <u-row>
-                  <u-col span="2" style="text-align: center">
-                    <view>
-                      <text>【{{ sample.sort }}】</text>
-                    </view>
-                  </u-col>
-                  <u-col span="10">
-                    <view>
-                      <text style="padding-left: 20rpx">{{ sample.sampleCode }}</text>
-                    </view>
-                    <view>
-                      <text style="padding-left: 20rpx"
-                        >{{ sample.dataSourceType | getDataSourceTypeShow }}{{ sample.sampleName }}</text
-                      >
-                    </view>
-                    <block v-if="sample.sampleWeight && sample.weightSubmitStatus != 0">
-                      <view>
-                        <text v-if="sample.sampleWeight" style="padding-left: 20rpx">{{ sample.sampleWeight }} g</text>
-                      </view>
-                    </block>
-                  </u-col>
-                </u-row>
-                <u-line style="padding: 10rpx" color="#bbb" />
-              </view>
-            </block>
-          </scroll-view>
-          <view class="content-main-right-operation">
-            <u-row>
-              <u-col span="4"></u-col>
-              <u-col span="4"></u-col>
-              <u-col span="4">
-                <u-button
-                  class="btn-operation"
-                  :disabled="this.taskList.length <= 0"
-                  type="success"
-                  @click="startWeighSample"
-                  >开始秤样</u-button
-                >
-              </u-col>
-            </u-row>
-          </view>
-        </view>
-      </u-col>
-    </u-row>
-  </view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      scrollTop: 0, //tab标题的滚动条位置
-      current: 0, // 预设当前项的值
-      menuHeight: 0, // 左边菜单的高度
-      menuItemHeight: 0, // 左边菜单item的高度
-      currentTask: '', //当前选中任务
-      currentTaskNo: '', //当前选中的任务编号
-      currentTaskType: '', //当前任务类型
-      taskList: [],
-      sampleList: []
-    }
-  },
-  onLoad() {
-    //获取任务列表
-    this.getAssayTask()
-  },
-  methods: {
-    //返回首页
-    customBack() {
-      uni.reLaunch({
-        url: '/pages/analysis/index/index'
-      })
-    },
-    taskStyle(task) {
-      if (task.weightTaskStatus == 0 && task.reviewCount > 0) {
-        return 'red'
-      }
-      if (task.weightTaskStatus == 1 && task.reviewCount > 0) {
-        return 'red'
-      }
-      if (task.weightTaskStatus == 2 && task.reviewCount > 0) {
-        return 'green'
-      }
-      return ''
-    },
-    sampleStyle(sample) {
-      //console.log(sample);
-      if (sample.weightSubmitStatus == 0 && sample.reviewCount > 0) {
-        return 'color: red'
-      }
-      if (sample.weightSubmitStatus == 1 && sample.reviewCount > 0) {
-        //return 'color: #e0861a';
-        return 'color: green'
-      }
-      if (sample.weightSubmitStatus == 2 && sample.reviewCount > 0) {
-        return 'color: green'
-      }
-      return ''
-    },
-    //开始秤样
-    startWeighSample() {
-      uni.navigateTo({
-        url:
-          '/pages/auncel/auncel-weigh?currentTaskNo=' + this.currentTaskNo + '&currentTaskType=' + this.currentTaskType
-      })
-    },
-    //切换任务
-    async swichTask(index) {
-      if (index == this.current) return
-      this.current = index
-      // 如果为0，意味着尚未初始化
-      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-        await this.getElRect('menu-scroll-view', 'menuHeight')
-        await this.getElRect('u-tab-item', 'menuItemHeight')
-      }
-      // 将菜单菜单活动item垂直居中
-      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2
-
-      //获取任务详情
-      this.currentTask = this.taskList[index]
-      this.currentTaskNo = this.taskList[index].taskNo
-      this.currentTaskType = this.taskList[index].taskType
-      this.getAssayTaskDetail(this.currentTaskNo)
-    },
-    // 获取一个目标元素的高度
-    getElRect(elClass, dataVal) {
-      new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery().in(this)
-        query
-          .select('.' + elClass)
-          .fields({ size: true }, res => {
-            // 如果节点尚未生成，res值为null，循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass)
-              }, 10)
-              return
-            }
-            this[dataVal] = res.height
-          })
-          .exec()
-      })
-    },
-    getAssayTask() {
-      //显示loading
-      uni.showLoading({
-        title: '加载中...'
-      })
-      const param = {
-        operateType: 'weight',
-        assayOper: this.userInfo.realname
-      }
-      this.$u.api
-        .getAssayTaskList(param)
-        .then(res => {
-          this.taskList = res.result
-
-          if (this.taskList && this.taskList.length > 0) {
-            this.currentTask = this.taskList[0]
-            this.currentTaskNo = this.taskList[0].taskNo
-            this.currentTaskType = this.taskList[0].taskType
-            this.getAssayTaskDetail(this.currentTaskNo)
-          }
-          uni.hideLoading()
-        })
-        .catch(err => {
-          uni.hideLoading()
-          console.log(err)
-        })
-    },
-    getAssayTaskDetail(taskNo) {
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
-        .then(res => {
-          this.sampleList = res.result
-          this.showLoading = false
-        })
-        .catch(err => {
-          this.showLoading = false
-          console.log(err)
-        })
-    }
-  },
-  filters: {
-    getDataSourceTypeShow(val) {
-      if (val == 2) return '【筛上】'
-      if (val == 3) return '【筛下】'
-      return ''
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.content-title {
-  height: 110rpx;
-  width: 100%;
-  font-size: 46rpx;
-  font-weight: 300;
-}
-
-.content-title-name {
-  padding: 20rpx;
-  text-align: center;
-}
-
-.content-main-height {
-  height: calc(100vh - 250rpx);
-}
-
-.content-main-left {
-  background-color: #f6f6f6;
-}
-
-.u-tab-item {
-  padding: 10rpx;
-  height: 200rpx;
-  background: #f6f6f6;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 36rpx;
-  color: #444;
-  font-weight: 400;
-  line-height: 1;
-  border-width: 4rpx;
-  border-bottom: dotted;
-}
-
-.u-tab-item-active {
-  position: relative;
-  color: #0055a2;
-  font-size: 36rpx;
-  font-weight: 600;
-  background: #fff;
-}
-
-.u-tab-item-active::before {
-  content: '';
-  position: absolute;
-
-  height: 32rpx;
-  left: 0;
-  top: 39rpx;
-}
-
-.content-main-right {
-  height: calc(100vh - 410rpx);
-}
-
-.content-main-right-operation {
-  height: 160rpx;
-  padding-top: 30rpx;
-}
-
-.btn-operation {
-  height: 100rpx;
-  font-size: 36rpx;
-}
-</style>
diff --git a/pages/analysis/sample/sample-work-detail.vue b/pages/analysis/sample/sample-work-detail.vue
index 404c243..d310afd 100644
--- a/pages/analysis/sample/sample-work-detail.vue
+++ b/pages/analysis/sample/sample-work-detail.vue
@@ -44,7 +44,7 @@
             v-for="(sample, index) in leftList"
             :key="index"
             class="u-tab-item"
-            :class="[current == index ? 'u-tab-item-active' : '']"
+            :class="[current.value === index ? 'u-tab-item-active' : '']"
             :data-current="index"
             @tap.stop="switchSample(index, false)"
           >
@@ -60,22 +60,22 @@
         <u-button class="btn-operation" type="primary" @click="submitTask()">提交指派单</u-button>
       </u-col>
       <u-col span="6">
-        <view class="field-name" v-html="selectedField.name" />
+        <view class="field-name" v-html="selectedField.value.name" />
         <zzjc-num-keyboard
           ref="myKeyboard"
-          v-show="selectedField.fillingWay == '1' && selectedField.type != 'select'"
+          v-show="selectedField.value.fillingWay === '1' && selectedField.value.type !== 'select'"
           :numKeyboardParam="numKeyboardParam"
         ></zzjc-num-keyboard>
-        <view v-if="selectedField.fillingWay == '2'" class="y-f">
+        <view v-if="selectedField.value.fillingWay === '2'" class="y-f">
           <view class="auncel" @click="selectAuncel">
             <view class="auncel-title"> {{ currentAuncel.code }}</view>
             <view class="auncel-weight">
               <view class="weight">
                 <view
                   :class="
-                    currentAuncel.weightStable == 0
+                    currentAuncel.weightStable === 0
                       ? 'weight-data-yellow'
-                      : currentAuncel.weightStable == 1
+                      : currentAuncel.weightStable === 1
                       ? 'weight-data'
                       : 'weight-data-warning'
                   "
@@ -89,7 +89,7 @@
 
           <u-button
             class="btn-operation"
-            v-if="currentAuncel.code == ''"
+            v-if="currentAuncel.code === ''"
             type="success"
             :disabled="confirmWeightDisabled"
             shape="circle"
@@ -104,12 +104,12 @@
           <scroll-view class="content-right-scroll" scroll-y scroll-with-animation>
             <view>
               <u-form :model="curSample" ref="uForm" label-width="140">
-                <template v-for="(fields, groupIndex) in fieldGroup">
-                  <view :key="'group_' + groupIndex" v-if="curParameterKey == '' || curParameterKey == fields.title">
+                <template v-for="(fields, groupIndex) in fieldGroup" :key="'group_' + groupIndex">
+                  <view v-if="curParameterKey.value === '' || curParameterKey.value === fields.title">
                     <!-- 组名 -->
                     <view class="my-collapse" @click="fields.open = !fields.open">
-                      <text class="title">{{ fields.title }}</text
-                      ><u-icon :name="fields.open ? 'arrow-up' : 'arrow-down'"></u-icon>
+                      <text class="title">{{ fields.title }}</text>
+                      <u-icon :name="fields.open ? 'arrow-up' : 'arrow-down'"></u-icon>
                     </view>
                     <view
                       class="content"
@@ -121,14 +121,17 @@
                         v-for="(field, fieldIndex) in fields.fields"
                         @click="fieldClick(field, groupIndex + '-' + fieldIndex)"
                         :key="groupIndex + '-' + fieldIndex"
-                        v-show="field.hidden != 1 && field.hidden != '1'"
-                        :class="{ 'selected-field': selectedFieldIndex === groupIndex + '-' + fieldIndex }"
+                        v-show="field.hidden !== 1 && field.hidden !== '1'"
+                        :class="{ 'selected-field': selectedFieldIndex.value === groupIndex + '-' + fieldIndex }"
                       >
                         <view
-                          :class="['label-my', { 'label-high-light': field.highlight == 1 || field.highlight == '1' }]"
+                          :class="[
+                            'label-my',
+                            { 'label-high-light': field.highlight === 1 || field.highlight === '1' }
+                          ]"
                           v-html="
                             field.name +
-                            (typeof field.unit != 'undefined' && field.unit != null && field.unit != ''
+                            (typeof field.unit !== 'undefined' && field.unit !== null && field.unit !== ''
                               ? '(' + field.unit + ')'
                               : '')
                           "
@@ -140,19 +143,19 @@
 							    -->
                           <u-input
                             style="width: 120px"
-                            v-if="field.fillingWay == 4"
+                            v-if="field.fillingWay === 4"
                             v-model="field.value"
                             :placeholder="field.placeholder"
                             type="text"
                           />
 
-                          <view v-if="field.type == 'select'" class="x-bc select-my" @click="field.showPicker = true">
+                          <view v-if="field.type === 'select'" class="x-bc select-my" @click="field.showPicker = true">
                             <text v-if="field.valueText">{{ field.valueText }}</text>
                             <text v-else>请选择</text>
                             <u-icon name="arrow-down" size="20"></u-icon>
                           </view>
                           <u-picker
-                            v-if="field.type == 'select'"
+                            v-if="field.type === 'select'"
                             :show="field.showPicker"
                             :columns="[field.options]"
                             keyName="dictValue"
@@ -160,15 +163,15 @@
                             @confirm="event => dicPickerConfirm(event, field)"
                           />
                           <!--普通输入框 使用文本显示-->
-                          <view class="content-my-text" v-if="field.type != 'select' && field.fillingWay != 4">
-                            <text v-if="!field.value || field.value == ''" class="content-my-text-placeholder">{{
+                          <view class="content-my-text" v-if="field.type !== 'select' && field.fillingWay !== 4">
+                            <text v-if="!field.value || field.value === ''" class="content-my-text-placeholder">{{
                               field.placeholder
                             }}</text>
                             <text
                               v-else
                               :class="[
                                 'content-my-text-value',
-                                { 'field-high-light': field.highlight == 1 || field.highlight == '1' }
+                                { 'field-high-light': field.highlight === 1 || field.highlight === '1' }
                               ]"
                               >{{ field.value }}</text
                             >
@@ -190,11 +193,13 @@
       ref="auncelSelector"
       v-model:showAuncelSelector="showAuncelSelector"
       :previousAuncelId="currentAuncel.id"
+      @doSelect="auncelDoSelect"
     ></auncel-select-popup>
   </view>
 </template>
 
-<script>
+<script setup>
+import { ref, reactive, computed, nextTick, onMounted } from 'vue'
 import request from '@/nx/request'
 import { calcAnalysisValue } from '@/nx/helper/calcAnalysisValue'
 import { number } from 'mathjs'
@@ -203,1031 +208,933 @@ import { getTenantId } from '@/defaultBaseUrl'
 import { useScreenOrientation } from '@/nx/hooks/useScreenOrientation'
 import nx from '@/nx'
 
-export default {
-  components: { AuncelSelectPopup },
-  data() {
-    return {
-      elId: this.$u.guid(),
-      scrollTop: 0, //tab标题的滚动条位置
-      current: 0, // 预设当前项的值
-      menuHeight: 0, // 左边菜单的高度
-      menuItemHeight: 0, // 左边菜单item的高度
-      orderGenBH: true, //顺序生成杯号
-      weightDataIsToZero: false, //重量数据是否归零
-      currentSample: {}, //当前样品
-      currentTaskNo: '', //当前任务指派单号
-      currentTaskId: '', //当前任务指派单id
-      currentTaskType: '', //当前任务类型
-      title: '',
-      numKeyboardParam: {
-        decimal: '-1' //数字键盘小数位数，-1为不限制
-      },
-      showAuncelSelector: false, //显示天平选择框
-      currentAuncel: {
-        id: '',
-        name: '',
-        code: '',
-        weightStable: 0,
-        weightData: '请选天平',
-        weightUnit: ''
-      },
-      selectedField: {},
-      selectedFieldIndex: '',
-      leftList: [],
-      curSample: {},
-      showDicPicker: false,
-      curParameterTitle: '选择字段分类',
-      curParameterKey: '',
-      curParameterClassify: '',
-      conAssayTaskId: '',
-      busSubCSampleId: '',
-      optionParameterClassify: [],
-      paramFieldApiRet: [],
-      fieldGroup: [],
-      collaHeights: []
-    }
-  },
-  computed: {
-    dynamicFieldPlaceholder(field) {
-      return '请输入'
-    },
-    confirmWeightDisabled() {
-      if (
-        this.currentSample.sampleCode &&
-        this.currentAuncel.weightStable == 1 &&
-        Number(this.currentAuncel.weightData) > 0
-      ) {
-        return false
-      }
-      return true
-    },
-    checkCupNumReadonly() {
-      if (!this.currentAuncel || this.currentAuncel.id == '') return true
-      return false
-    },
-    userInfo() {
-      return nx.$store('user').userInfo
-    }
-  },
-  onLoad(param) {
-    const { lockOrientation } = useScreenOrientation()
-    lockOrientation('landscape')
-    const me = this
-    if (param.currentTaskNo) {
-      this.currentTaskNo = param.currentTaskNo
-      this.currentTaskType = param.currentTaskType
-    }
-    this.title = '样品分析-任务指派单：' + param.currentTaskNo
-    this.getAssayTaskDetail(this.currentTaskNo)
-    this.loadFieldApiData(this.fieldGroup)
-    this.listenNumKeyboard()
-    this.listenAuncelSelect()
-  },
-  onShow() {
-    console.log('onShow')
-    this.loadDevice()
-    this.listenDeviceData()
-  },
-  onHide() {
-    console.log('onHide')
-    //移除监听websocket返回来的数据
-    // this.closeDeviceLink();
-    this.closeDeviceListener()
-    // this.closeEventListener();
-  },
-  onUnload() {
-    console.log('onUnload')
-    //移除监听websocket返回来的数据
-    this.closeDeviceLink()
-    this.closeDeviceListener()
-    this.closeEventListener()
-  },
-  onBackPress(options) {
-    this.customBack()
-    return true
-  },
-  methods: {
-    getDomHeight() {
-      this.collaHeights = []
-      this.$nextTick(() => {
-        if (this.fieldGroup.length) {
-          this.fieldGroup.forEach((item, index) => {
-            this.$u.getRect('#elId' + index).then(res => {
-              this.collaHeights.push(res.height)
-            })
-          })
-        }
-      })
-    },
-    //返回上一页
-    customBack() {
-      uni.redirectTo({
-        url: '/pages/analysis/sample/sample-work-list'
-      })
-    },
-    navRightClick() {
-      let url = '/pages/analysis/sample/sample-work-edit-task'
-      url += '?currentTaskNo=' + this.currentTaskNo
-      uni.navigateTo({
-        url: url
-      })
-    },
-    parameterClassifyChange(v, a) {
-      const me = this
-      let groupIndex = 0
-      me.curParameterKey = v
-      me.optionParameterClassify.forEach(function (item, index) {
-        if (item.value == v) {
-          groupIndex = index
-          me.curParameterTitle = item.label
-        }
-      })
-      if (v == '') groupIndex = 0
-      if (groupIndex > 0) groupIndex--
-      //自动选中字段
-      me.selectedFieldIndex = groupIndex + '-'
-      me.autoNextField()
-    },
-    fieldClick(field, key) {
-      try {
-        this.$refs.myKeyboard.clearNum()
-      } catch (e) {
-        console.error(e)
-      }
-      if (field.fillingWay == 4) return
-      this.selectedField = field
-      this.selectedFieldIndex = key
-      //判断小数位数
-      let dataType = field.dataType
-      if (dataType == null || dataType < -1) dataType = -1
-      this.numKeyboardParam.decimal = dataType
-      if (field.fillingWay == 2) {
-        this.listenDeviceData()
-      } else {
-        this.closeDeviceListener()
-      }
-    },
-    //自动切换到下一个字段
-    autoNextField() {
-      const me = this
-      //selectedFieldIndex是groupIndex-fieldIndex
-      let groupIndex = 0
-      let fieldIndex = 0
-      if (typeof me.selectedFieldIndex == 'undefined' || me.selectedFieldIndex == '') me.selectedFieldIndex = '0-'
-      const indexV = me.selectedFieldIndex.split('-')
-      groupIndex = number(indexV[0])
-      fieldIndex = indexV[1] == '' ? -1 : number(indexV[1])
-      const group = me.fieldGroup[groupIndex]
-      const fields = group.fields
-      if (fields.length > fieldIndex + 1) {
-        //如果下一个字段是计算，不自动切换
-        const fillingWay = fields[fieldIndex + 1].fillingWay || ''
-        if (fillingWay == '3') return
-        //切换到下一个字段
-        const key = groupIndex + '-' + (fieldIndex + 1)
-        me.fieldClick(fields[fieldIndex + 1], key)
-      }
-    },
-    //自动切换到下一个样品
-    autoNextSample() {
-      //仅在顺序称重时自动切换
-      // if (!this.orderWeighChecked)
-      //   return;
-      if (this.leftList.length <= this.current + 1) return
-      const index = this.current + 1
-      this.switchSample(index, true)
-    },
-    //手动切换样品
-    async switchSample(index, autoFlag) {
-      const me = this
-      //重置天平归0
-      this.weightDataIsToZero = false
-      //清空数字键盘数据
-      this.$refs.myKeyboard.clearNum()
-      if (index == this.current) return
-      // if (this.orderWeighChecked && !autoFlag) return;//顺序称重不允许选中
-      this.current = index
-      // 如果为0，意味着尚未初始化
-      if (this.menuHeight == 0 || this.menuItemHeight == 0) {
-        // await this.getElRect('menu-scroll-view', 'menuHeight');
-        await this.getElRect('u-tab-item', 'menuItemHeight')
-      }
-      // 将菜单菜单活动item垂直居中
-      this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2 - 50
-      //修改当前选中的me.selectedFieldIndex
-      if (typeof me.selectedFieldIndex != 'undefined' && me.selectedFieldIndex.indexOf('-') > 0) {
-        me.selectedFieldIndex = me.selectedFieldIndex.split('-')[0] + '-'
-      }
-      this.currentSample = this.leftList[index]
-      //读取样品明细字段
-      this.getDetailFieldsAndStatus(true)
-    },
-    // 获取一个目标元素的高度
-    getElRect(elClass, dataVal) {
-      new Promise((resolve, reject) => {
-        const query = uni.createSelectorQuery().in(this)
-        query
-          .select('.' + elClass)
-          .fields({ size: true }, res => {
-            // 如果节点尚未生成，res值为null，循环调用执行
-            if (!res) {
-              setTimeout(() => {
-                this.getElRect(elClass)
-              }, 10)
-              return
-            }
-            this[dataVal] = res.height
-          })
-          .exec()
-      })
-    },
-    //读取样品明细字段
-    getDetailFieldsAndStatus(autoSelectNextField) {
-      const me = this
-      const taskDetailId = this.currentSample.id
-      uni.showLoading({
-        title: '加载中...'
-      })
-      //读取回收率配置
-      this.loadConRecoveryList()
-      //查询字段
-      this.$u.api
-        .queryFieldsByTaskDetail({ taskDetailId: taskDetailId })
-        .then(res => {
-          me.fieldGroup = []
-          if (!res.success) {
-            this.$helper.showToast({
-              title: res.message
-            })
-            return
-          }
-          //处理“填写&计算”字段：如果后台存了值，则不自动计算
-          const groupList = res.result
-          for (const g of groupList) {
-            g.open = true
-            for (const f of g.fields) {
-              if (f.fillingWay == '1' && f.value != null && f.value != '') {
-                f.valueTypeManual = '1'
-              }
-            }
-          }
-          me.fieldGroup = groupList
-          const arr = [
-            {
-              label: '全部',
-              value: ''
-            }
-          ]
-          for (const g of me.fieldGroup) {
-            const title = g.title
-            const o = {
-              label: title,
-              value: title
-            }
-            arr.push(o)
-          }
-          // 计算样品详情高度
-          me.getDomHeight()
-          me.optionParameterClassify = arr //字段分类
-          me.conAssayTaskId = res.additionalProperties.conAssayTaskId
-          me.busSubCSampleId = res.additionalProperties.busSubCSampleId
-          const detail = res.additionalProperties.taskDetail
-          // console.log('detail', JSON.stringify(detail));
-          //处理硫值、硫量：未保存过的数据，读取接口返回的硫值、硫量
-          this.loadSValue(detail)
-          //自动生成杯号
-          me.autoGenerateCupNum()
-          //自动选择下一个字段
-          if (autoSelectNextField) me.autoNextField()
-          //按公式计算值，并检查原数据与计算后的数据是否一致
-          me.calAndCheck()
+// 响应式数据定义
+const elId = nx.$helper.uuid()
+const scrollTop = ref(0) //tab标题的滚动条位置
+const current = ref(0) // 预设当前项的值
+const menuHeight = ref(0) // 左边菜单的高度
+const menuItemHeight = ref(0) // 左边菜单item的高度
+const orderGenBH = ref(true) //顺序生成杯号
+const weightDataIsToZero = ref(false) //重量数据是否归零
+const currentSample = ref({}) //当前样品
+const currentTaskNo = ref('') //当前任务指派单号
+const currentTaskId = ref('') //当前任务指派单id
+const currentTaskType = ref('') //当前任务类型
+const title = ref('')
+const numKeyboardParam = reactive({
+  decimal: '-1' //数字键盘小数位数，-1为不限制
+})
+const showAuncelSelector = ref(false) //显示天平选择框
+const currentAuncel = reactive({
+  id: '',
+  name: '',
+  code: '',
+  weightStable: 0,
+  weightData: '请选天平',
+  weightUnit: ''
+})
+const selectedField = ref({})
+const selectedFieldIndex = ref('')
+const leftList = ref([])
+const curSample = ref({})
+const showDicPicker = ref(false)
+const curParameterTitle = ref('选择字段分类')
+const curParameterKey = ref('')
+const curParameterClassify = ref('')
+const conAssayTaskId = ref('')
+const busSubCSampleId = ref('')
+const optionParameterClassify = ref([])
+const paramFieldApiRet = ref([])
+const fieldGroup = ref([])
+const collaHeights = ref([])
+
+// 计算属性
+const confirmWeightDisabled = computed(() => {
+  if (currentSample.value.sampleCode && currentAuncel.weightStable === 1 && Number(currentAuncel.weightData) > 0) {
+    return false
+  }
+  return true
+})
+
+const checkCupNumReadonly = computed(() => {
+  if (!currentAuncel.value || currentAuncel.value.id === '') return true
+  return false
+})
+
+const userInfo = computed(() => nx.$store('user').userInfo)
+
+// 方法定义
+const getDomHeight = () => {
+  collaHeights.value = []
+  nextTick(() => {
+    if (fieldGroup.value.length) {
+      fieldGroup.value.forEach((item, index) => {
+        nx.getRect('#elId' + index).then(res => {
+          collaHeights.value.push(res.height)
         })
-        .finally(() => {
-          uni.hideLoading()
-        })
-    },
-    checkLoadSValue() {
-      const vKey = 'sRange'
-      const vF = this.getFieldByKey(vKey)
-      if (vF == null) return false
-      const v = vF.value
-      if (v == null || v == '') return true
-      try {
-        if (v == 0 || number(v) == 0) return true
-      } catch (e) {}
-      return false
-    },
-    //读取硫值、硫量
-    loadSValue(detail) {
-      let flag = this.checkLoadSValue()
-      // console.log('detail', JSON.stringify(detail));
-      // console.log('this.fieldGroup', JSON.stringify(this.fieldGroup));
-      if (!flag) return
-      const vKey = 'sValue'
-      const rKey = 'sRange'
-      const vF = this.getFieldByKey(vKey)
-      if (vF != null) {
-        vF.value = detail.svalue
-      }
-      const rF = this.getFieldByKey(rKey)
-      if (rF != null) {
-        rF.value = detail.srange
-      }
-    },
-    getFieldByKey(key) {
-      const group = this.fieldGroup
-      let field = null
-      for (let g of group) {
-        for (let f of g.fields) {
-          const dicKey = f.dicKey
-          if (dicKey && dicKey == key) {
-            field = f
-            break
-          }
-        }
-      }
-      // console.log('field', JSON.stringify(field));
-      return field
-    },
-    //按公式计算值，并检查原数据与计算后的数据是否一致
-    calAndCheck() {
-      const me = this
-      //提取原本数值
-      const oldVal = me.fitUpValues()
-      calcAnalysisValue(me.fieldGroup)
-      if (me.checkDataNew(oldVal)) return
-      const newVal = me.fitUpValues(oldVal)
-      //检查是否一致
-      let modifyFlag = false
-      for (const o in oldVal) {
-        let old = oldVal[o]
-        if (old == null) old = 0
-        //判断是否number
-        try {
-          // console.log(o + '----oldVal[o]=' + old, 'newVal[o]=' + newVal[o]);
-          if (number(old) != number(newVal[o])) {
-            modifyFlag = true
-          }
-        } catch (e) {
-          // console.error(e);
-          if (old != newVal[o]) modifyFlag = true
-        }
-      }
-      if (modifyFlag)
-        uni.showToast({
-          title: '数据有修改，请检查所有样品，并重新保存！',
-          duration: 2000,
-          icon: 'error'
-        })
-    },
-    //检查是否是新数据
-    checkDataNew(data) {
-      for (const o in data) {
-        if (data[o] != null && data[o] != '0') return false
-      }
-      return true
-    },
-    //组装表单值，用于数据比对
-    fitUpValues() {
-      const val = {}
-      for (const g of this.fieldGroup) {
-        for (const f of g.fields) {
-          const detailId = f.detailId
-          if (!detailId) continue
-          val[detailId] = f.value
-        }
-      }
-      return val
-    },
-    clearFieldVal() {
-      uni.showModal({
-        title: '提示',
-        content: '清空当前字段的值，是否继续？',
-        cancelColor: '#0055A2',
-        confirmColor: '#0055A2',
-        success: res => {
-          if (res.cancel) {
-            return
-          }
-          this.selectedField.value = ''
-          this.selectedField.valueTypeManual = '0'
-          //重新计算
-          calcAnalysisValue(this.fieldGroup)
-          // const dataType = this.selectedField.dataType || 0;
-          // //数字类型，改为0
-          // if(dataType > 0){
-          //   let val = '0';
-          //   let dotLen = 0;
-          //   if(val.indexOf('.') > 0)
-          //     dotLen = val.length - val.indexOf('.') - 1;
-          //   else
-          //     val += '.';
-          //   while(dotLen < dataType){
-          //     dotLen ++;
-          //     val += '0';
-          //   }
-          //   this.selectedField.value = val;
-          // }else{
-          //   //文本类型，直接清空
-          //   this.selectedField.value = '';
-          // }
-        }
       })
-    },
-    listenNumKeyboard() {
-      const me = this
-      //键盘监听
-      uni.$on('keyboardOK', res => {
-        if (res == null) {
-          this.clearFieldVal()
+    }
+  })
+}
+
+//返回上一页
+const customBack = () => {
+  uni.redirectTo({
+    url: '/pages/analysis/sample/sample-work-list'
+  })
+}
+
+const navRightClick = () => {
+  let url = '/pages/analysis/sample/sample-work-edit-task'
+  url += '?currentTaskNo=' + currentTaskNo.value
+  uni.navigateTo({
+    url: url
+  })
+}
+
+const parameterClassifyChange = (v, a) => {
+  const groupIndex = ref(0)
+  curParameterKey.value = v
+  optionParameterClassify.value.forEach((item, index) => {
+    if (item.value === v) {
+      groupIndex.value = index
+      curParameterTitle.value = item.label
+    }
+  })
+  if (v === '') groupIndex.value = 0
+  if (groupIndex.value > 0) groupIndex.value--
+  //自动选中字段
+  selectedFieldIndex.value = groupIndex.value + '-'
+  autoNextField()
+}
+
+const fieldClick = (field, key) => {
+  try {
+    myKeyboard.value.clearNum()
+  } catch (e) {
+    console.error(e)
+  }
+  if (field.fillingWay === 4) return
+  selectedField.value = field
+  selectedFieldIndex.value = key
+  //判断小数位数
+  let dataType = field.dataType
+  if (dataType == null || dataType < -1) dataType = -1
+  numKeyboardParam.decimal = dataType
+  if (field.fillingWay === 2) {
+    listenDeviceData()
+  } else {
+    closeDeviceListener()
+  }
+}
+
+//自动切换到下一个字段
+const autoNextField = () => {
+  //selectedFieldIndex是groupIndex-fieldIndex
+  let groupIndex = 0
+  let fieldIndex = 0
+  if (typeof selectedFieldIndex.value === 'undefined' || selectedFieldIndex.value === '')
+    selectedFieldIndex.value = '0-'
+  const indexV = selectedFieldIndex.value.split('-')
+  groupIndex = number(indexV[0])
+  fieldIndex = indexV[1] === '' ? -1 : number(indexV[1])
+  const group = fieldGroup.value[groupIndex]
+  const fields = group.fields
+  if (fields.length > fieldIndex + 1) {
+    //如果下一个字段是计算，不自动切换
+    const fillingWay = fields[fieldIndex + 1].fillingWay || ''
+    if (fillingWay === '3') return
+    //切换到下一个字段
+    const key = groupIndex + '-' + (fieldIndex + 1)
+    fieldClick(fields[fieldIndex + 1], key)
+  }
+}
+
+//自动切换到下一个样品
+const autoNextSample = () => {
+  //仅在顺序称重时自动切换
+  // if (!orderWeighChecked.value)
+  //   return;
+  if (leftList.value.length <= current.value + 1) return
+  const index = current.value + 1
+  switchSample(index, true)
+}
+
+//手动切换样品
+const switchSample = async (index, autoFlag) => {
+  //重置天平归0
+  weightDataIsToZero.value = false
+  //清空数字键盘数据
+  myKeyboard.value.clearNum()
+  if (index === current.value) return
+  // if (orderWeighChecked.value && !autoFlag) return;//顺序称重不允许选中
+  current.value = index
+  // 如果为0，意味着尚未初始化
+  if (menuHeight.value === 0 || menuItemHeight.value === 0) {
+    // await getElRect('menu-scroll-view', 'menuHeight');
+    await getElRect('u-tab-item', 'menuItemHeight')
+  }
+  // 将菜单菜单活动item垂直居中
+  scrollTop.value = index * menuItemHeight.value + menuItemHeight.value / 2 - menuHeight.value / 2 - 50
+  //修改当前选中的selectedFieldIndex
+  if (typeof selectedFieldIndex.value !== 'undefined' && selectedFieldIndex.value.indexOf('-') > 0) {
+    selectedFieldIndex.value = selectedFieldIndex.value.split('-')[0] + '-'
+  }
+  currentSample.value = leftList.value[index]
+  //读取样品明细字段
+  getDetailFieldsAndStatus(true)
+}
+
+// 获取一个目标元素的高度
+const getElRect = (elClass, dataVal) => {
+  return new Promise((resolve, reject) => {
+    const query = uni.createSelectorQuery().in(this)
+    query
+      .select('.' + elClass)
+      .fields({ size: true }, res => {
+        // 如果节点尚未生成，res值为null，循环调用执行
+        if (!res) {
+          setTimeout(() => {
+            getElRect(elClass)
+          }, 10)
           return
         }
-        //自动补全小数位数
-        const dataType = me.selectedField.dataType || 0
-        let val = res.val
-        //判断val小数位，如果小于设定位数，则补全
-        if (dataType > 0) {
-          if (val == '') val = '0'
-          if (typeof val == 'number') val += ''
-          let dotLen = 0
-          if (val.indexOf('.') > 0) dotLen = val.length - val.indexOf('.') - 1
-          else val += '.'
-          while (dotLen < dataType) {
-            dotLen++
-            val += '0'
-          }
-        }
-        me.selectedField.value = val
-        me.selectedField.valueTypeManual = '1' //标记为手动值，不参与计算
-        const dicKey = me.selectedField.dicKey
-        if (dicKey && dicKey == 'bh_down') {
-          me.autoFillBhUp(val)
-        }
-        calcAnalysisValue(me.fieldGroup)
-        //自动跳转下一个字段
-        setTimeout(() => {
-          me.autoNextField()
-        }, 60)
+        this[dataVal] = res.height
       })
-    },
-    //自动填写筛上杯号
-    autoFillBhUp(val) {
-      const bh = Number(val) + 1
-      for (const g of this.fieldGroup) {
-        for (const f of g.fields) {
-          if (f.dicKey && f.dicKey == 'bh_up') {
-            f.value = bh + ''
-            return
-          }
-        }
-      }
-    },
-    selectAuncel() {
-      // if (this.currentAuncel.weightData != '请选天平') {
-      //   return;
-      // }
-      this.showAuncelSelector = true
-      // this.closeDeviceListener();
-    },
-    listenAuncelSelect() {
-      //天平选择框监听
-      uni.$on('auncelSelector_close', res => {
-        this.showAuncelSelector = false
-        // this.listenDeviceData();
-      })
-      uni.$on('auncelSelector_doSelect', res => {
-        this.showAuncelSelector = false
-        // console.log('auncelSelector_doSelect', res);
-        //如果控制了天平，释放控制
+      .exec()
+  })
+}
 
-        const data = res.data
-        // console.log('主页面 res', JSON.stringify(res));
-        if (data) {
-          this.currentAuncel.id = data.deviceId
-          this.currentAuncel.name = data.deviceName
-          this.currentAuncel.code = data.deviceCode
-        }
-        // console.log('主页面，this.currentAuncel', JSON.stringify(this.currentAuncel));
-        // const deviceId = this.currentAuncel.id;
-        // if(typeof deviceId != 'undefined' && deviceId != null){
-        //   this.releaseDeviceControl(deviceId);
-        // }
-        // this.listenDeviceData();
+//读取样品明细字段
+const getDetailFieldsAndStatus = autoSelectNextField => {
+  const taskDetailId = currentSample.value.id
+  //读取回收率配置
+  loadConRecoveryList()
+  //查询字段
+  nx.$api.assayTask.queryFieldsByTaskDetail({ taskDetailId: taskDetailId }).then(res => {
+    fieldGroup.value = []
+    if (!res.success) {
+      nx.$helper.showToast({
+        title: res.message
       })
-    },
-    checkBh() {
-      //检查杯号
-      let hasHb = true
-      for (const g of this.fieldGroup) {
-        for (const f of g.fields) {
-          if (f.dicKey && f.dicKey.indexOf('bh_') >= 0) {
-            if (typeof f.value == 'undefined' || f.value == null || f.value == '') hasHb = false
-          }
+      return
+    }
+    //处理“填写&计算”字段：如果后台存了值，则不自动计算
+    const groupList = res.result
+    for (const g of groupList) {
+      g.open = true
+      for (const f of g.fields) {
+        if (f.fillingWay === '1' && f.value != null && f.value !== '') {
+          f.valueTypeManual = '1'
         }
       }
-      if (!hasHb) {
-        this.$helper.showToast({
-          title: '杯号不能为空，请填写杯号！'
-        })
-        return false
+    }
+    fieldGroup.value = groupList
+    const arr = [
+      {
+        label: '全部',
+        value: ''
       }
-      return true
-    },
-    saveAuncelData() {
-      //检查杯号
-      if (!this.checkBh()) return
-      //保存数据
-      if (!this.weightDataIsToZero) {
-        this.$helper.showToast({
-          title: '天平必须先回零！'
-        })
+    ]
+    for (const g of fieldGroup.value) {
+      const title = g.title
+      const o = {
+        label: title,
+        value: title
+      }
+      arr.push(o)
+    }
+    // 计算样品详情高度
+    getDomHeight()
+    optionParameterClassify.value = arr //字段分类
+    conAssayTaskId.value = res.additionalProperties.conAssayTaskId
+    busSubCSampleId.value = res.additionalProperties.busSubCSampleId
+    const detail = res.additionalProperties.taskDetail
+    //处理硫值、硫量：未保存过的数据，读取接口返回的硫值、硫量
+    loadSValue(detail)
+    //自动生成杯号
+    autoGenerateCupNum()
+    //自动选择下一个字段
+    if (autoSelectNextField) autoNextField()
+    //按公式计算值，并检查原数据与计算后的数据是否一致
+    calAndCheck()
+  })
+}
+
+const checkLoadSValue = () => {
+  const vKey = 'sRange'
+  const vF = getFieldByKey(vKey)
+  if (vF === null) return false
+  const v = vF.value
+  if (v === null || v === '') return true
+  try {
+    if (v === 0 || number(v) === 0) return true
+  } catch (e) {}
+  return false
+}
+
+//读取硫值、硫量
+const loadSValue = detail => {
+  let flag = checkLoadSValue()
+  if (!flag) return
+  const vKey = 'sValue'
+  const rKey = 'sRange'
+  const vF = getFieldByKey(vKey)
+  if (vF !== null) {
+    vF.value = detail.svalue
+  }
+  const rF = getFieldByKey(rKey)
+  if (rF !== null) {
+    rF.value = detail.srange
+  }
+}
+
+const getFieldByKey = key => {
+  const group = fieldGroup.value
+  let field = null
+  for (let g of group) {
+    for (let f of g.fields) {
+      const dicKey = f.dicKey
+      if (dicKey && dicKey === key) {
+        field = f
+        break
+      }
+    }
+  }
+  return field
+}
+
+//按公式计算值，并检查原数据与计算后的数据是否一致
+const calAndCheck = () => {
+  //提取原本数值
+  const oldVal = fitUpValues()
+  calcAnalysisValue(fieldGroup.value)
+  if (checkDataNew(oldVal)) return
+  const newVal = fitUpValues(oldVal)
+  //检查是否一致
+  let modifyFlag = false
+  for (const o in oldVal) {
+    let old = oldVal[o]
+    if (old === null) old = 0
+    //判断是否number
+    try {
+      if (number(old) !== number(newVal[o])) {
+        modifyFlag = true
+      }
+    } catch (e) {
+      if (old !== newVal[o]) modifyFlag = true
+    }
+  }
+  if (modifyFlag)
+    uni.showToast({
+      title: '数据有修改，请检查所有样品，并重新保存！',
+      duration: 2000,
+      icon: 'error'
+    })
+}
+
+//检查是否是新数据
+const checkDataNew = data => {
+  for (const o in data) {
+    if (data[o] !== null && data[o] !== '0') return false
+  }
+  return true
+}
+
+//组装表单值，用于数据比对
+const fitUpValues = () => {
+  const val = {}
+  for (const g of fieldGroup.value) {
+    for (const f of g.fields) {
+      const detailId = f.detailId
+      if (!detailId) continue
+      val[detailId] = f.value
+    }
+  }
+  return val
+}
+
+const clearFieldVal = () => {
+  uni.showModal({
+    title: '提示',
+    content: '清空当前字段的值，是否继续？',
+    cancelColor: '#0055A2',
+    confirmColor: '#0055A2',
+    success: res => {
+      if (res.cancel) {
         return
       }
-      //获取当前重量
-      let weight = this.currentAuncel.weightData
+      selectedField.value.value = ''
+      selectedField.value.valueTypeManual = '0'
+      //重新计算
+      calcAnalysisValue(fieldGroup.value)
+    }
+  })
+}
 
-      this.selectedField.value = weight
-      const curFieldDicKey = this.selectedField.dicKey
-      let upDownFlag = ''
-      if (curFieldDicKey && curFieldDicKey != '' && curFieldDicKey.indexOf('_') > 0) {
-        upDownFlag = curFieldDicKey.substring(curFieldDicKey.lastIndexOf('_') + 1)
-      }
-
-      //这里不修改weightDataIsToZero，在切换样品是修改
-      // this.weightDataIsToZero = false;
-
-      //保存天平编号、天平名称、称重时间。支持筛上、筛下
-      if (curFieldDicKey && curFieldDicKey.indexOf('sampleWeight') >= 0) {
-        let auncelNoFieldKey = 'auncelNo'
-        let measureTimeFieldKey = 'measureTime'
-        if (upDownFlag && upDownFlag !== '') {
-          auncelNoFieldKey += '_' + upDownFlag
-          measureTimeFieldKey += '_' + upDownFlag
-        }
-        const auncelNoField = this.getFieldByKey(auncelNoFieldKey)
-        if (auncelNoField != null) {
-          auncelNoField.value = this.currentAuncel.code
-        }
-        const measureTimeField = this.getFieldByKey(measureTimeFieldKey)
-        if (measureTimeField != null) {
-          measureTimeField.value = this.$helper.dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss')
-        }
-      }
-      // for(const g of this.fieldGroup){
-      //   for(const f of g.fields){
-      //     //天平编号
-      //     if(f.dicKey == 'auncelNo' || f.dicKey == 'auncelNo_' + upDownFlag)
-      //       f.value = this.currentAuncel.code;
-      //     //样重
-      //     if(f.dicKey == 'sampleWeight' || f.dicKey == 'sampleWeight_' + upDownFlag)
-      //       f.value = weight;
-      //     //称重时间
-      //     if(f.dicKey == 'measureTime' || f.dicKey == 'measureTime_' + upDownFlag)
-      //       f.value = this.$helper.dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss');
-      //   }
-      // }
-      //指派单明细上的称重时间
-      this.curSample.measureTime = this.$helper.dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss')
-      //计算
-      try {
-        calcAnalysisValue(this.fieldGroup)
-      } catch (e) {
-        console.error(e)
-      }
-
-      //自动跳转下一个字段
-      setTimeout(() => {
-        this.autoNextField()
-      }, 100)
-    },
-    checkSubmit() {
-      //检查必填字段
-      let fieldNames = ''
-      for (const g of this.fieldGroup) {
-        for (const f of g.fields) {
-          let name = f.shortName
-          if (name == null || name == '') name = f.name
-          if (f.allowNull == 1 || f.allowNull == '1') continue
-          if (f.value == null || f.value == '') {
-            fieldNames += name + '，'
-          }
-        }
-      }
-      if (fieldNames != '') {
-        this.$helper.showToast({
-          title: '请填写必填字段：' + fieldNames
-        })
-        return false
-      }
-      //检查不能为0的字段
-      fieldNames = ''
-      for (const g of this.fieldGroup) {
-        for (const f of g.fields) {
-          let name = f.shortName
-          if (name == null || name == '') name = f.name
-          //检查不可为0的数据
-          if (f.notZero == 1 || f.notZero == '1') {
-            if (f.value == null || f.value == '' || number(f.value) == 0) {
-              fieldNames += name + '，'
-            }
-          }
-        }
-      }
-      if (fieldNames != '') {
-        this.$helper.showToast({
-          title: '这几个值不能为0，请检查：' + fieldNames
-        })
-        return false
-      }
-
-      return true
-    },
-    saveDetail() {
-      //检查杯号
-      if (!this.checkBh()) return
-      const valueList = []
-      let cupNum = 0
-      let detailId = this.currentSample.id
-      for (const g of this.fieldGroup) {
-        for (const f of g.fields) {
-          // if(f.value == null || f.value == '') //空值也要传入后端
-          //   continue;
-          if (f.dicKey == 'bh' || f.dicKey == 'bh_up') cupNum = f.value
-          valueList.push({
-            id: f.detailId,
-            type: f.pOrE,
-            value: f.value,
-            name: f.name,
-            dataType: f.dataType
-          })
-        }
-      }
-      const data = {
-        busSubCSampleId: this.busSubCSampleId,
-        conAssayTaskId: this.conAssayTaskId,
-        measureTime: this.curSample.measureTime,
-        elementParamValueList: valueList,
-        busAssayTaskDetailId: detailId
-      }
-      if (typeof cupNum != 'undefined' && cupNum != null && cupNum != '' && cupNum != 0 && cupNum != '0') {
-        //提交杯号，保存到后台
-        data.cupNum = cupNum
-        //标记当前杯号
-        this.markCurCupNum(cupNum)
-      }
-      uni.showLoading({
-        title: '请稍后...'
-      })
-      this.$u.api
-        .saveDetailValue(data)
-        .then(res => {
-          //如果仅保存，在这里触发切换
-          setTimeout(() => {
-            this.autoNextSample()
-          }, 1000)
-        })
-        .catch(err => {
-          console.error(err)
-        })
-        .finally(() => {
-          uni.hideLoading()
-        })
-    },
-    //提交任务指派单
-    submitTask() {
-      const data = {
-        taskNo: this.currentTaskNo
-      }
-      const msg = '请确认所有样品数据都已保存，然后再提交指派单！是否继续？'
-      uni.showModal({
-        title: '提示',
-        content: msg,
-        cancelColor: '#0055A2',
-        confirmColor: '#0055A2',
-        success: res => {
-          if (res.cancel) return
-          uni.showLoading({
-            title: '请稍后...'
-          })
-          this.$u.api
-            .submitTask(data)
-            .then(res => {
-              this.$helper.showToast({
-                title: '提交成功！'
-              })
-              uni.navigateTo({
-                url: '/pages/analysis/sample/sample-report'
-              })
-            })
-            .catch(err => {
-              console.error(err)
-            })
-            .finally(() => {
-              uni.hideLoading()
-            })
-        }
-      })
-    },
-    //自动生成杯号（仅顺序称重）：第一杯：手填，后续杯 = 上一杯 + 1
-    autoGenerateCupNum() {
-      if (!this.orderGenBH) return
-      let cupNum = 0
-
-      let current = this.current
-      if (typeof current == 'undefined' || current == null) current = 0
-      //第一杯
-      if (current == 0) {
-        cupNum = 1
-        this.putCupNum(cupNum)
+//自动填写筛上杯号
+const autoFillBhUp = val => {
+  const bh = Number(val) + 1
+  for (const g of fieldGroup.value) {
+    for (const f of g.fields) {
+      if (f.dicKey && f.dicKey === 'bh_up') {
+        f.value = bh + ''
         return
       }
-      //取上一个样品的杯号
-      const sample = this.leftList[current - 1]
-      cupNum = sample.cupNum
-      if (typeof cupNum == 'undefined' || cupNum == null || cupNum == '') return
-      //杯号赋值到当前样品
-      this.putCupNum(Number(cupNum) + 1, current, Number(cupNum))
-    },
-    markCurCupNum(cupNum) {
-      this.currentSample.cupNum = cupNum
-    },
-    putCupNum(cupNum, sampleIndex, lastCupNum) {
-      if (typeof sampleIndex == 'undefined' || sampleIndex == null) sampleIndex = 0
-      const cupNumKey = 'bh'
-      for (const fields of this.fieldGroup) {
-        if (typeof fields == 'undefined') continue
-        //杯号
-        for (const field of fields.fields) {
-          if (field.dicKey == cupNumKey) {
-            if (typeof field.value == 'undefined' || field.value == null || field.value == '') {
-              field.value = cupNum
-              return true
-            }
-          }
-        }
-      }
-      //处理筛上筛下
-      if (lastCupNum && lastCupNum == sampleIndex) {
-        //上一个杯号 == 默认杯号
-        cupNum = sampleIndex * 2 + 1
-      }
-      for (const fields of this.fieldGroup) {
-        if (typeof fields == 'undefined') continue
-        //杯号-筛下
-        for (const field of fields.fields) {
-          if (field.dicKey == cupNumKey + '_down') {
-            if (typeof field.value == 'undefined' || field.value == null || field.value == '') {
-              field.value = cupNum
-              cupNum++
-              break
-            }
-          }
-        }
-        //杯号-筛上
-        for (const field of fields.fields) {
-          if (field.dicKey == cupNumKey + '_up') {
-            if (typeof field.value == 'undefined' || field.value == null || field.value == '') {
-              field.value = cupNum
-              return true
-            }
-          }
-        }
-      }
-      return false
-    },
-    loadConRecoveryList() {
-      const conBaseSampleId = this.currentSample.conBaseSampleId
-      const rParam = {
-        pageNo: 1,
-        pageSize: -1,
-        conBaseSampleId: conBaseSampleId
-      }
-      const storageKey = 'ConRecoveryRateList'
-      this.$u.api
-        .queryConRecoveryRateList(rParam)
-        .then(res => {
-          const result = res.result
-          if (typeof result == 'undefined' || result == null || !result) {
-            uni.setStorage(storageKey, [])
-            return
-          }
-          const records = result.records
-          if (!records || records.length == 0) {
-            uni.setStorage(storageKey, [])
-            return
-          }
-          uni.setStorageSync(storageKey, records)
-          // this.conRecoveryList = res.result;
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    getAssayTaskDetail(taskNo) {
-      this.leftList = []
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
-        .then(res => {
-          let dataList = res.result
-          dataList.forEach((item, index) => {
-            this.leftList.push(item)
-          })
-          if (this.leftList.length == 0) {
-            return
-          }
-          this.current = 0
-          this.currentSample = this.leftList[0]
-          this.getDetailFieldsAndStatus(true)
-          // if (this.orderWeighChecked) {
-          //   this.current = 0;
-          //   this.currentSample = this.leftList[0];
-          //   this.getDetailFieldsAndStatus(true);
-          // } else {
-          //   this.current = -1;
-          //   this.currentSample = {};
-          // }
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    orderWeighChange(e) {
-      if (e && this.leftList.length > 0) {
-        //this.current = 0;
-        //this.currentSample = this.leftList[0];
-        this.getAssayTaskDetail(this.currentTaskNo)
-        return
-      }
-      this.current = -1
-      this.currentSample = {}
-    },
-    async apiRequest(url) {
-      return request({
-        url: url,
-        method: 'GET',
-        custom: {
-          isApiEncryption: true
-        }
-      })
-    },
-    //读取字段里的API选项
-    async loadFieldApiData(fieldGroups) {
-      for (const fields of fieldGroups) {
-        for (const field of fields.fields) {
-          const api = field.api
-          const type = field.type
-          if (type == 'select' && api && api != '') {
-            //读取API选项
-            try {
-              const res = await this.apiRequest(api)
-              const data = res
-              field.options = data
-              field.rangeKey = 'displayName'
-            } catch (e) {}
-          }
-        }
-      }
-    },
-    /*
-     * 选择器组件确认事件
-     * event： 事件默认参数
-     * field： 当前字段
-     * 处理逻辑：
-     *   field.value = 选中的值
-     *   field.valueText = 选中的文本
-     * */
-    dicPickerConfirm(event, field) {
-      const me = this
-      const checked = event.value[0]
-      const displayName = checked.displayName
-      const value = checked.dictValue
-      const extField1 = checked.extField1
-      field.value = value
-      field.valueText = value
-
-      const relatedFieldNo = '8'
-      //查找并处理关联字段
-      for (const fieldGroup of this.fieldGroup) {
-        for (const field of fieldGroup.fields) {
-          if (field.paramNo == relatedFieldNo) {
-            field.value = extField1
-            break
-          }
-        }
-      }
-      //触发计算公式
-      calcAnalysisValue(me.fieldGroup)
-    },
-    listenDeviceData() {
-      //监听websocket返回来的数据
-      //设备数据
-      uni.$on('deviceData', res => {
-        // console.log('deviceData', res);
-        switch (res.deviceType) {
-          case 'auncel':
-            if (this.currentAuncel.id === res.deviceId) {
-              this.currentAuncel.weightData = res.weightData
-              this.currentAuncel.weightUnit = res.weightUnit
-              this.currentAuncel.weightStable = res.weightStable
-              this.currentAuncel.isConnected = 1
-              if (Number(res.weightData) == 0) {
-                this.weightDataIsToZero = true
-              }
-            }
-            break
-          default:
-            break
-        }
-      })
-      //设备状态
-      uni.$on('deviceStatus', res => {
-        if (this.currentAuncel.id === res.deviceId) {
-          // console.log('deviceStatus', res);
-          if (res.connected == 0) {
-            this.currentAuncel.weightStable = 0
-            this.currentAuncel.weightData = '天平断开'
-            this.currentAuncel.weightUnit = ''
-          }
-        }
-        this.currentAuncel.isConnected = res.connected
-      })
-      //控制设备状态
-      uni.$on('controlDevice', res => {
-        if (this.currentAuncel.id === res.deviceId) {
-          // console.log('controlDevice', res);
-          this.currentAuncel.id = ''
-          this.currentAuncel.name = ''
-          this.currentAuncel.code = ''
-          this.currentAuncel.weightStable = 0
-          this.currentAuncel.weightData = '请选天平'
-          this.currentAuncel.weightUnit = ''
-        }
-      })
-      //连接断开
-      uni.$on('connClose', res => {
-        //重置
-        this.currentAuncel.weightData = ''
-        this.currentAuncel.weightUnit = ''
-        this.currentAuncel.weightStable = 0
-        this.currentAuncel.controlUserName = ''
-        this.currentAuncel.isConnected = 0
-      })
-    },
-    loadDevice() {
-      //注册websocket
-      let regData = {
-        msgId: this.$helper.uuid(),
-        cmd: 'register',
-        clientType: 'caaClient',
-        data: {
-          userId: this.userInfo.id,
-          tenantId: getTenantId(),
-          userRealName: this.userInfo.realname
-        }
-      }
-      this.$measure.setRegData(JSON.stringify(regData))
-      this.$measure.reOpen()
-    },
-    closeEventListener() {
-      uni.$off('keyboardOK')
-      // uni.$off('auncelSelector_close');
-      // uni.$off('auncelSelector_doSelect');
-    },
-    closeDeviceListener() {
-      uni.$off('deviceData')
-      uni.$off('deviceStatus')
-      uni.$off('controlDevice')
-      uni.$off('connClose')
-    },
-    closeDeviceLink() {
-      const deviceId = this.currentAuncel.id
-      this.releaseDeviceControl(deviceId)
-    },
-    //释放设备控制
-    releaseDeviceControl(deviceId) {
-      if (!deviceId || deviceId == '') return
-      let controlDevice = {
-        msgId: deviceId,
-        cmd: 'controlDevice',
-        clientType: 'caaClient',
-        data: {
-          deviceId: deviceId,
-          isControl: false,
-          controlRealName: this.userInfo.realname
-        }
-      }
-      //发送控制数据
-      this.$measure.send(JSON.stringify(controlDevice))
-    },
-    getDataSourceTypeShow(val) {
-      if (val == 2) return '【筛上】'
-      if (val == 3) return '【筛下】'
-      return ''
     }
   }
 }
+
+const checkBh = () => {
+  //检查杯号
+  let hasHb = true
+  for (const g of fieldGroup.value) {
+    for (const f of g.fields) {
+      if (f.dicKey && f.dicKey.indexOf('bh_') >= 0) {
+        if (typeof f.value === 'undefined' || f.value === null || f.value === '') hasHb = false
+      }
+    }
+  }
+  if (!hasHb) {
+    nx.$helper.showToast({
+      title: '杯号不能为空，请填写杯号！'
+    })
+    return false
+  }
+  return true
+}
+
+const saveAuncelData = () => {
+  //检查杯号
+  if (!checkBh()) return
+  //保存数据
+  if (!weightDataIsToZero.value) {
+    nx.$helper.showToast({
+      title: '天平必须先回零！'
+    })
+    return
+  }
+  //获取当前重量
+  let weight = currentAuncel.weightData
+
+  selectedField.value.value = weight
+  const curFieldDicKey = selectedField.value.dicKey
+  let upDownFlag = ''
+  if (curFieldDicKey && curFieldDicKey !== '' && curFieldDicKey.indexOf('_') > 0) {
+    upDownFlag = curFieldDicKey.substring(curFieldDicKey.lastIndexOf('_') + 1)
+  }
+
+  //这里不修改weightDataIsToZero，在切换样品是修改
+  // weightDataIsToZero.value = false;
+
+  //保存天平编号、天平名称、称重时间。支持筛上、筛下
+  if (curFieldDicKey && curFieldDicKey.indexOf('sampleWeight') >= 0) {
+    let auncelNoFieldKey = 'auncelNo'
+    let measureTimeFieldKey = 'measureTime'
+    if (upDownFlag && upDownFlag !== '') {
+      auncelNoFieldKey += '_' + upDownFlag
+      measureTimeFieldKey += '_' + upDownFlag
+    }
+    const auncelNoField = getFieldByKey(auncelNoFieldKey)
+    if (auncelNoField !== null) {
+      auncelNoField.value = currentAuncel.code
+    }
+    const measureTimeField = getFieldByKey(measureTimeFieldKey)
+    if (measureTimeField !== null) {
+      measureTimeField.value = nx.$dayjs.format('yyyy-MM-dd hh:mm:ss')
+    }
+  }
+  //指派单明细上的称重时间
+  curSample.value.measureTime = nx.$dayjs.format('yyyy-MM-dd hh:mm:ss')
+  //计算
+  try {
+    calcAnalysisValue(fieldGroup.value)
+  } catch (e) {
+    console.error(e)
+  }
+
+  //自动跳转下一个字段
+  setTimeout(() => {
+    autoNextField()
+  }, 100)
+}
+
+const checkSubmit = () => {
+  //检查必填字段
+  let fieldNames = ''
+  for (const g of fieldGroup.value) {
+    for (const f of g.fields) {
+      let name = f.shortName
+      if (name === null || name === '') name = f.name
+      if (f.allowNull === 1 || f.allowNull === '1') continue
+      if (f.value === null || f.value === '') {
+        fieldNames += name + '，'
+      }
+    }
+  }
+  if (fieldNames !== '') {
+    nx.$helper.showToast({
+      title: '请填写必填字段：' + fieldNames
+    })
+    return false
+  }
+  //检查不能为0的字段
+  fieldNames = ''
+  for (const g of fieldGroup.value) {
+    for (const f of g.fields) {
+      let name = f.shortName
+      if (name === null || name === '') name = f.name
+      //检查不可为0的数据
+      if (f.notZero === 1 || f.notZero === '1') {
+        if (f.value === null || f.value === '' || number(f.value) === 0) {
+          fieldNames += name + '，'
+        }
+      }
+    }
+  }
+  if (fieldNames !== '') {
+    nx.$helper.showToast({
+      title: '这几个值不能为0，请检查：' + fieldNames
+    })
+    return false
+  }
+
+  return true
+}
+
+const saveDetail = () => {
+  //检查杯号
+  if (!checkBh()) return
+  const valueList = []
+  let cupNum = 0
+  let detailId = currentSample.value.id
+  for (const g of fieldGroup.value) {
+    for (const f of g.fields) {
+      if (f.dicKey === 'bh' || f.dicKey === 'bh_up') cupNum = f.value
+      valueList.push({
+        id: f.detailId,
+        type: f.pOrE,
+        value: f.value,
+        name: f.name,
+        dataType: f.dataType
+      })
+    }
+  }
+  const data = {
+    busSubCSampleId: busSubCSampleId.value,
+    conAssayTaskId: conAssayTaskId.value,
+    measureTime: curSample.value.measureTime,
+    elementParamValueList: valueList,
+    busAssayTaskDetailId: detailId
+  }
+  if (typeof cupNum !== 'undefined' && cupNum !== null && cupNum !== '' && cupNum !== 0 && cupNum !== '0') {
+    //提交杯号，保存到后台
+    data.cupNum = cupNum
+    //标记当前杯号
+    markCurCupNum(cupNum)
+  }
+  nx.$api.assayTask.saveDetailValue(data).then(res => {
+    //如果仅保存，在这里触发切换
+    setTimeout(() => {
+      autoNextSample()
+    }, 1000)
+  })
+}
+
+//提交任务指派单
+const submitTask = () => {
+  const data = {
+    taskNo: currentTaskNo.value
+  }
+  const msg = '请确认所有样品数据都已保存，然后再提交指派单！是否继续？'
+  uni.showModal({
+    title: '提示',
+    content: msg,
+    cancelColor: '#0055A2',
+    confirmColor: '#0055A2',
+    success: res => {
+      if (res.cancel) return
+
+      nx.$api.assayTask.submitTask(data).then(res => {
+        uni.navigateTo({
+          url: '/pages/analysis/sample/sample-report'
+        })
+      })
+    }
+  })
+}
+
+//自动生成杯号（仅顺序称重）：第一杯：手填，后续杯 = 上一杯 + 1
+const autoGenerateCupNum = () => {
+  if (!orderGenBH.value) return
+  let cupNum = 0
+
+  let current = current.value
+  if (typeof current === 'undefined' || current === null) current = 0
+  //第一杯
+  if (current === 0) {
+    cupNum = 1
+    putCupNum(cupNum)
+    return
+  }
+  //取上一个样品的杯号
+  const sample = leftList.value[current - 1]
+  cupNum = sample.cupNum
+  if (typeof cupNum === 'undefined' || cupNum === null || cupNum === '') return
+  //杯号赋值到当前样品
+  putCupNum(Number(cupNum) + 1, current, Number(cupNum))
+}
+
+const markCurCupNum = cupNum => {
+  currentSample.value.cupNum = cupNum
+}
+
+const putCupNum = (cupNum, sampleIndex, lastCupNum) => {
+  if (typeof sampleIndex === 'undefined' || sampleIndex === null) sampleIndex = 0
+  const cupNumKey = 'bh'
+  for (const fields of fieldGroup.value) {
+    if (typeof fields === 'undefined') continue
+    //杯号
+    for (const field of fields.fields) {
+      if (field.dicKey === cupNumKey) {
+        if (typeof field.value === 'undefined' || field.value === null || field.value === '') {
+          field.value = cupNum
+          return true
+        }
+      }
+    }
+  }
+  //处理筛上筛下
+  if (lastCupNum && lastCupNum === sampleIndex) {
+    //上一个杯号 == 默认杯号
+    cupNum = sampleIndex * 2 + 1
+  }
+  for (const fields of fieldGroup.value) {
+    if (typeof fields === 'undefined') continue
+    //杯号-筛下
+    for (const field of fields.fields) {
+      if (field.dicKey === cupNumKey + '_down') {
+        if (typeof field.value === 'undefined' || field.value === null || field.value === '') {
+          field.value = cupNum
+          cupNum++
+          break
+        }
+      }
+    }
+    //杯号-筛上
+    for (const field of fields.fields) {
+      if (field.dicKey === cupNumKey + '_up') {
+        if (typeof field.value === 'undefined' || field.value === null || field.value === '') {
+          field.value = cupNum
+          return true
+        }
+      }
+    }
+  }
+  return false
+}
+
+const loadConRecoveryList = () => {
+  const conBaseSampleId = currentSample.value.conBaseSampleId
+  const rParam = {
+    pageNo: 1,
+    pageSize: -1,
+    conBaseSampleId: conBaseSampleId
+  }
+  const storageKey = 'ConRecoveryRateList'
+  nx.$api.assayTask
+    .queryConRecoveryRateList(rParam)
+    .then(res => {
+      const result = res.result
+      if (typeof result === 'undefined' || result === null || !result) {
+        uni.setStorage(storageKey, [])
+        return
+      }
+      const records = result.records
+      if (!records || records.length === 0) {
+        uni.setStorage(storageKey, [])
+        return
+      }
+      uni.setStorageSync(storageKey, records)
+    })
+    .catch(err => {
+      console.error(err)
+    })
+}
+
+const getAssayTaskDetail = taskNo => {
+  leftList.value = []
+  nx.$api.assayTask
+    .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
+    .then(res => {
+      let dataList = res.result
+      dataList.forEach((item, index) => {
+        leftList.value.push(item)
+      })
+      if (leftList.value.length === 0) {
+        return
+      }
+      current.value = 0
+      currentSample.value = leftList.value[0]
+      getDetailFieldsAndStatus(true)
+    })
+    .catch(err => {
+      console.error(err)
+    })
+}
+
+const apiRequest = async url => {
+  return request({
+    url: url,
+    method: 'GET'
+  })
+}
+
+//读取字段里的API选项
+const loadFieldApiData = async fieldGroups => {
+  for (const fields of fieldGroups) {
+    for (const field of fields.fields) {
+      const api = field.api
+      const type = field.type
+      if (type === 'select' && api && api !== '') {
+        //读取API选项
+        try {
+          const res = await apiRequest(api)
+          const data = res
+          field.options = data
+          field.rangeKey = 'displayName'
+        } catch (e) {}
+      }
+    }
+  }
+}
+
+/*
+ * 选择器组件确认事件
+ * event： 事件默认参数
+ * field： 当前字段
+ * 处理逻辑：
+ *   field.value = 选中的值
+ *   field.valueText = 选中的文本
+ * */
+const dicPickerConfirm = (event, field) => {
+  const checked = event.value[0]
+  const displayName = checked.displayName
+  const value = checked.dictValue
+  const extField1 = checked.extField1
+  field.value = value
+  field.valueText = value
+
+  const relatedFieldNo = '8'
+  //查找并处理关联字段
+  for (const fieldGroup of fieldGroup.value) {
+    for (const field of fieldGroup.fields) {
+      if (field.paramNo === relatedFieldNo) {
+        field.value = extField1
+        break
+      }
+    }
+  }
+  //触发计算公式
+  calcAnalysisValue(fieldGroup.value)
+}
+// 天平监听
+const listenDeviceData = () => {
+  //监听websocket返回来的数据
+  //设备数据
+  uni.$on('deviceData', res => {
+    switch (res.deviceType) {
+      case 'auncel':
+        if (currentAuncel.id === res.deviceId) {
+          currentAuncel.weightData = res.weightData
+          currentAuncel.weightUnit = res.weightUnit
+          currentAuncel.weightStable = res.weightStable
+          currentAuncel.isConnected = 1
+          if (Number(res.weightData) === 0) {
+            weightDataIsToZero.value = true
+          }
+        }
+        break
+      default:
+        break
+    }
+  })
+  //设备状态
+  uni.$on('deviceStatus', res => {
+    if (currentAuncel.id === res.deviceId) {
+      if (res.connected === 0) {
+        currentAuncel.weightStable = 0
+        currentAuncel.weightData = '天平断开'
+        currentAuncel.weightUnit = ''
+      }
+    }
+    currentAuncel.isConnected = res.connected
+  })
+  //控制设备状态
+  uni.$on('controlDevice', res => {
+    if (currentAuncel.id === res.deviceId) {
+      currentAuncel.id = ''
+      currentAuncel.name = ''
+      currentAuncel.code = ''
+      currentAuncel.weightStable = 0
+      currentAuncel.weightData = '请选天平'
+      currentAuncel.weightUnit = ''
+    }
+  })
+  //连接断开
+  uni.$on('connClose', res => {
+    //重置
+    currentAuncel.weightData = ''
+    currentAuncel.weightUnit = ''
+    currentAuncel.weightStable = 0
+    currentAuncel.controlUserName = ''
+    currentAuncel.isConnected = 0
+  })
+}
+const closeDeviceListener = () => {
+  uni.$off('deviceData')
+  uni.$off('deviceStatus')
+  uni.$off('controlDevice')
+  uni.$off('connClose')
+}
+const loadDevice = () => {
+  //注册websocket
+  let regData = {
+    msgId: nx.$helper.uuid(),
+    cmd: 'register',
+    clientType: 'caaClient',
+    data: {
+      userId: userInfo.value.id,
+      tenantId: getTenantId(),
+      userRealName: userInfo.value.realname
+    }
+  }
+  nx.$measure.setRegData(JSON.stringify(regData))
+  nx.$measure.reOpen()
+}
+
+// 键盘监听
+const listenNumKeyboard = () => {
+  //键盘监听
+  uni.$on('keyboardOK', res => {
+    if (res === null) {
+      clearFieldVal()
+      return
+    }
+    //自动补全小数位数
+    const dataType = selectedField.value.dataType || 0
+    let val = res.val
+    //判断val小数位，如果小于设定位数，则补全
+    if (dataType > 0) {
+      if (val === '') val = '0'
+      if (typeof val === 'number') val += ''
+      let dotLen = 0
+      if (val.indexOf('.') > 0) dotLen = val.length - val.indexOf('.') - 1
+      else val += '.'
+      while (dotLen < dataType) {
+        dotLen++
+        val += '0'
+      }
+    }
+    selectedField.value.value = val
+    selectedField.value.valueTypeManual = '1' //标记为手动值，不参与计算
+    const dicKey = selectedField.value.dicKey
+    if (dicKey && dicKey === 'bh_down') {
+      autoFillBhUp(val)
+    }
+    calcAnalysisValue(fieldGroup.value)
+    //自动跳转下一个字段
+    setTimeout(() => {
+      autoNextField()
+    }, 60)
+  })
+}
+const closeNumKeyBoardListener = () => {
+  uni.$off('keyboardOK')
+}
+
+const closeDeviceLink = () => {
+  const deviceId = currentAuncel.id
+  releaseDeviceControl(deviceId)
+}
+
+//释放设备控制
+const releaseDeviceControl = deviceId => {
+  if (!deviceId || deviceId === '') return
+  let controlDevice = {
+    msgId: deviceId,
+    cmd: 'controlDevice',
+    clientType: 'caaClient',
+    data: {
+      deviceId: deviceId,
+      isControl: false,
+      controlRealName: userInfo.value.nickname
+    }
+  }
+  //发送控制数据
+  nx.$measure.send(JSON.stringify(controlDevice))
+}
+
+const getDataSourceTypeShow = val => {
+  if (val === 2) return '【筛上】'
+  if (val === 3) return '【筛下】'
+  return ''
+}
+// 天平选择
+const selectAuncel = () => {
+  showAuncelSelector.value = true
+}
+// 天平选择回调
+const auncelDoSelect = res => {
+  const data = res.data
+  if (data) {
+    currentAuncel.id = data.deviceId
+    currentAuncel.name = data.deviceName
+    currentAuncel.code = data.deviceCode
+  }
+}
+// refs
+const myKeyboard = ref(null)
+const auncelSelector = ref(null)
+
+// 生命周期
+const { lockOrientation } = useScreenOrientation()
+
+onLoad(param => {
+  lockOrientation('landscape')
+  if (param.currentTaskNo) {
+    currentTaskNo.value = param.currentTaskNo
+    currentTaskType.value = param.currentTaskType
+  }
+  title.value = '样品分析-任务指派单：' + param.currentTaskNo
+  getAssayTaskDetail(currentTaskNo.value)
+  loadFieldApiData(fieldGroup.value)
+  listenNumKeyboard()
+})
+
+onShow(() => {
+  loadDevice()
+  listenDeviceData()
+})
+
+onHide(() => {
+  closeDeviceListener()
+})
+
+onUnload(() => {
+  closeDeviceLink()
+  closeDeviceListener()
+  closeNumKeyBoardListener()
+})
+
+onBackPress(() => {
+  customBack()
+  return true
+})
 </script>
+
 <style lang="scss" scoped>
+/* 原始样式保留不变 */
 .navbar-right {
   font-size: 16px;
   color: #fff;
diff --git a/pages/analysis/sample/sample-work-edit-task.vue b/pages/analysis/sample/sample-work-edit-task.vue
index 1749546..aaa4665 100644
--- a/pages/analysis/sample/sample-work-edit-task.vue
+++ b/pages/analysis/sample/sample-work-edit-task.vue
@@ -20,7 +20,7 @@
                 <u-input
                   v-if="
                     field.type == 'input' &&
-                    (field.decimalCount == null || field.decimalCount == '' || Number(field.decimalCount == null) < 0)
+                    (field.decimalCount == null || field.decimalCount == '' || Number(field.decimalCount) < 0)
                   "
                   v-model="field.value"
                   clearable
@@ -29,7 +29,7 @@
                 />
                 <!--数字，限制小数位数-->
                 <u-input
-                  v-if="field.type == 'input' && field.decimalCount != null && Number(field.decimalCount == null) >= 0"
+                  v-if="field.type == 'input' && field.decimalCount != null && Number(field.decimalCount) >= 0"
                   type="number"
                   clearable
                   @blur="event => checkDecimal(event, field)"
@@ -77,482 +77,483 @@
   </view>
 </template>
 
-<script>
+<script setup>
+import { ref, computed } from 'vue'
 import request from '@/nx/request'
-import { cloneDeep } from 'lodash'
+import { cloneDeep } from 'lodash-es'
 import { calcAnalysisValue } from '@/nx/helper/calcAnalysisValue'
 import nx from '@/nx'
-export default {
-  data() {
-    return {
-      title: '编辑指派单',
-      taskInstance: {},
-      scrollTop: 0, //tab标题的滚动条位置
-      currentTaskNo: '', //当前任务样品
-      showDicPicker: false,
-      curDate: Number(new Date()),
-      //字段值对象
-      formValue: {},
-      //后端返回的字段结构
-      sourceFormFields: [],
-      //处理后的字段结构
-      formFields: [],
-      sampleList: []
-    }
-  },
-  computed: {
-    dynamicFieldPlaceholder(field) {
-      return '请输入'
-    }
-  },
-  onLoad(param) {
-    if (param.currentTaskNo) {
-      this.currentTaskNo = param.currentTaskNo
-    }
-    this.title = '样品分析-任务指派单：' + this.currentTaskNo
-    this.loadHeadFieldsAndValueByTaskNo()
-    this.getSampleList(this.currentTaskNo)
-  },
-  methods: {
-    handleFieldClick(field) {
-      if (field.type == 'date') {
-        if (field.fillingWay == '1') {
-          field.showPicker = true
-        }
-        return
-      }
+import { onLoad } from '@dcloudio/uni-app'
+
+// ========== data ==========
+
+// 标题
+const title = ref('编辑指派单')
+// 表单模型
+const taskInstance = ref({})
+// tab标题的滚动条位置
+const scrollTop = ref(0)
+// 当前任务样品
+const currentTaskNo = ref('')
+// 字典选择器显示
+const showDicPicker = ref(false)
+// 当前日期（用于日期选择器）
+const curDate = ref(Number(new Date()))
+// 字段值对象
+const formValue = ref({})
+// 后端返回的字段结构
+const sourceFormFields = ref([])
+// 处理后的字段结构
+const formFields = ref([])
+// 样品列表
+const sampleList = ref([])
+
+// 表单引用
+const uForm = ref(null)
+
+// 页面加载
+onLoad(param => {
+  if (param.currentTaskNo) {
+    currentTaskNo.value = param.currentTaskNo
+  }
+  title.value = '样品分析-任务指派单：' + currentTaskNo.value
+  loadHeadFieldsAndValueByTaskNo()
+  getSampleList(currentTaskNo.value)
+})
+
+// ========== methods ==========
+
+// 点击字段（打开选择器）
+function handleFieldClick(field) {
+  if (field.type == 'date') {
+    if (field.fillingWay == '1') {
       field.showPicker = true
-    },
-    checkFeadToDetailField(headToDetailField) {
-      if (headToDetailField && headToDetailField.trim() != '') {
-        return true
-      } else {
-        return false
-      }
-    },
-    getSampleList(taskNo) {
-      this.$u.api
-        .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
-        .then(res => {
-          this.sampleList = res.result
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    //返回上一页
-    // customBack() {
-    //   uni.redirectTo({
-    //     url: "/pages/sample/sample-work-detail"
-    //   });
-    // },
-    navRightClick() {},
-    //处理小数位数：补0或去除多余位数
-    checkDecimal(e, field) {
-      if (e == '') return
-      const decimalCount = field.decimalCount
-      if (decimalCount == null || decimalCount == '' || isNaN(decimalCount)) return
-      const count = Number(field.decimalCount)
+    }
+    return
+  }
+  field.showPicker = true
+}
+
+// 判断是否需要同步到明细字段（加粗显示）
+function checkFeadToDetailField(headToDetailField) {
+  if (headToDetailField && headToDetailField.trim() != '') {
+    return true
+  } else {
+    return false
+  }
+}
+
+// 获取样品列表
+function getSampleList(taskNo) {
+  nx.$api.assayTask
+    .getAssayTaskDetailListByTaskNo({ taskNo: taskNo })
+    .then(res => {
+      sampleList.value = res.result
+    })
+    .catch(err => {
+      console.error(err)
+    })
+}
+
+// 返回上一页（原注释保留，未启用）
+// function customBack() {
+//   uni.redirectTo({
+//     url: "/pages/sample/sample-work-detail"
+//   });
+// }
+
+// 右上角导航点击（空实现）
+function navRightClick() {}
+
+// 处理小数位数：补0或去除多余位数
+function checkDecimal(e, field) {
+  if (e == '') return
+  const decimalCount = field.decimalCount
+  if (decimalCount == null || decimalCount == '' || isNaN(decimalCount)) return
+  const count = Number(field.decimalCount)
+  const value = field.value
+  const pos = value.indexOf('.') + 1
+  let length = value.length - pos
+  if (pos == 0) {
+    length = 0
+  }
+  while (length < count) {
+    if (field.value.indexOf('.') < 0) field.value += '.'
+    field.value = field.value + '0'
+    length++
+  }
+  if (count === 0) {
+    field.value = parseInt(field.value) + ''
+  } else if (length > count) {
+    field.value = field.value.substring(0, pos + count)
+  }
+}
+
+// 组装字段（处理默认值、初始化 picker 状态）
+function assembleFields() {
+  const formFieldsArr = []
+  for (const field of sourceFormFields.value) {
+    //日期类型的默认值
+    if (field.type == 'date') {
       const value = field.value
-      const pos = value.indexOf('.') + 1
-      let length = value.length - pos
-      if (pos == 0) {
-        length = 0
-      }
-      while (length < count) {
-        if (field.value.indexOf('.') < 0) field.value += '.'
-        field.value = field.value + '0'
-        length++
-      }
-      if (count === 0) {
-        field.value = parseInt(field.value) + ''
-      } else if (length > count) {
-        field.value = field.value.substring(0, pos + count)
-      }
-    },
-    updateFieldValue(name, val) {
-      for (const field of this.formFields) {
-        if (field.prop == name) {
-          field.value = val
-          break
-        }
-      }
-    },
-    assembleFields() {
-      const me = this
-      const formFields = []
-      for (const field of this.sourceFormFields) {
-        //日期类型的默认值
-        if (field.type == 'date') {
-          const value = field.value
-          field.showPicker = false
-          if (value == 'curDate') {
-            field.value = me.$helper.dateFormat(new Date(), 'yyyy-MM-dd')
-          }
-        }
-        if (field.type == 'select') {
-          field.showPicker = false
-        }
-        formFields.push(field)
-      }
-      //先序列化再转json，避免json里定义的方法丢失
-      this.formFields = JSON.parse(JSON.stringify(formFields, replacer), reviver)
-
-      // this.formFields = formFields;
-    },
-    //绑定数据
-    bindFormValue() {
-      const me = this
-      //formValue
-      for (const field of me.formFields) {
-        const prop = field.prop
-        if (prop) {
-          const value = me.formValue[prop]
-          if (value) {
-            field.value = value
-            if (field.type == 'select') {
-              field.valueText = value
-            }
-          }
-        }
-      }
-    },
-    //获取表单字段和值（老数据）
-    loadHeadFieldsAndValueByTaskNo() {
-      const me = this
-      const currentTaskNo = me.currentTaskNo
-      this.$u.api
-        .queryHeadValueByTaskNo({ taskNo: currentTaskNo })
-        .then(res => {
-          const result = res.result
-          const formConf = result.formConf
-          me.sourceFormFields = eval(formConf)
-          me.formValue = JSON.parse(result.formValue)
-          //加载和处理表单字段
-          me.assembleFields()
-          //绑定数据
-          me.bindFormValue()
-          //读取字段里的动态选项
-          me.loadFieldApiData()
-          console.log('formFields', this.formFields)
-        })
-        .catch(err => {
-          //如果没有查到数据，按配置读取新的表单字段
-          me.getHeadFields()
-        })
-    },
-    // 获取表单字段（新数据）
-    getHeadFields() {
-      const me = this
-      const currentTaskNo = this.currentTaskNo
-      uni.showLoading({
-        title: '加载中...'
-      })
-      this.$u.api
-        .queryHeadFieldsByTaskNo({ taskNo: currentTaskNo })
-        .then(res => {
-          me.sourceFormFields = me.analysisFormAndFields(res)
-          //加载和处理表单字段
-          me.assembleFields()
-          //读取字段里的动态选项
-          me.loadFieldApiData()
-        })
-        .finally(() => {
-          uni.hideLoading()
-        })
-    },
-    analysisFormAndFields(formRet) {
-      const fieldsArray = []
-      for (const form of formRet) {
-        let content = cloneDeep(form.content)
-        content = eval('(' + content + ')')
-        const column = content.column
-        for (const field of column) {
-          fieldsArray.push(field)
-        }
-      }
-      return fieldsArray
-    },
-    //将抬头字段值同步保存到明细字段
-    saveHeadValueToDetail(onComplete) {
-      //循环抬头字段，提取需哟保存到明细的字段
-      const conf = []
-      for (const field of this.formFields) {
-        const prop = field.prop
-        const headToDetailField = field.headToDetailField
-        if (prop && headToDetailField && headToDetailField.trim() != '') {
-          const value = field.value
-          const r = {
-            prop: field.prop,
-            value: value,
-            headToDetailField: headToDetailField
-          }
-          conf.push(r)
-        }
-      }
-      const data = {
-        taskNo: this.currentTaskNo,
-        conf: conf
-      }
-      this.$u.api.saveHeadValueToDetail(data).then(res => {
-        if (onComplete) onComplete()
-      })
-    },
-    handleSave() {
-      //显示loading
-      uni.showLoading({
-        title: '正在保存...'
-      })
-      //组装数据
-      const formValue = {}
-      for (const field of this.formFields) {
-        const prop = field.prop
-        if (prop) {
-          formValue[prop] = field.value
-        }
-      }
-      const value = {
-        taskNo: this.currentTaskNo,
-        formValue: JSON.stringify(formValue),
-        formConf: JSON.stringify(this.sourceFormFields, replacer)
-      }
-      this.$u.api
-        .saveHeadValue(value)
-        .then(async res => {
-          await this.saveHeadValueToDetail(async () => {
-            if (this.checkPropertyEquality()) {
-              await this.processIds(this.sampleList, 100)
-            } else {
-              uni.hideLoading()
-              // this.$helper.showToast({
-              //   title: '保存成功！'
-              // });
-              uni.redirectTo({
-                url: '/pages/analysis/sample/sample-work-detail?currentTaskNo=' + this.currentTaskNo
-              })
-            }
-          })
-        })
-        .catch(err => {
-          uni.hideLoading()
-          console.log(err)
-        })
-    },
-    // 检查字段修改前和修改后字段值是否相等
-    checkPropertyEquality() {
-      for (const field of this.formFields) {
-        const prop = field.prop
-        if (prop && field['headToDetailField'] && field['headToDetailField'].trim() !== '') {
-          const flag = this.formValue[prop] !== field.value ? true : false
-          if (flag) return true
-        }
-      }
-      return false
-    },
-    //保存抬头字段
-    saveHeadData() {
-      if (this.checkPropertyEquality()) {
-        uni.showModal({
-          title: '提示',
-          content: '您修改的字段将影响样品分析结果，系统将重新计算',
-          showCancel: false,
-          success: res => {
-            if (res.confirm) {
-              this.handleSave()
-            }
-          }
-        })
-      } else {
-        this.handleSave()
-      }
-    },
-    // 通过样品id查询明细
-    async getSampleDataById(taskDetailId) {
-      let fieldGroup = []
-      const { result, additionalProperties } = await this.$u.api.queryFieldsByTaskDetail({
-        taskDetailId,
-        isSearchSRange: '0'
-      })
-      fieldGroup = result
-      const conAssayTaskId = additionalProperties.conAssayTaskId
-      const busSubCSampleId = additionalProperties.busSubCSampleId
-      const detail = additionalProperties.taskDetail
-      //处理硫值、硫量：未保存过的数据，读取接口返回的硫值、硫量
-      // this.loadSValue(detail);
-      //按公式计算值，并检查原数据与计算后的数据是否一致
-      try {
-        calcAnalysisValue(fieldGroup)
-      } catch (error) {
-        console.log(error)
-      }
-      let valueList = []
-      let cupNum = 0
-      for (const g of fieldGroup) {
-        for (const f of g.fields) {
-          if (f.dicKey == 'bh' || f.dicKey == 'bh_up') cupNum = f.value
-          valueList.push({
-            id: f.detailId,
-            type: f.pOrE,
-            value: f.value,
-            name: f.name,
-            dataType: f.dataType
-          })
-        }
-      }
-      let params = {
-        busSubCSampleId,
-        conAssayTaskId,
-        // measureTime : this.curSample.measureTime,
-        elementParamValueList: valueList,
-        busAssayTaskDetailId: taskDetailId
-      }
-      if (typeof cupNum != 'undefined' && cupNum != null && cupNum != '' && cupNum != 0 && cupNum != '0') {
-        //提交杯号，保存到后台
-        params.cupNum = cupNum
-      }
-      return params
-    },
-    // 提交样品
-    async submitData(data) {
-      try {
-        await this.$u.api.saveDetailValue(data)
-      } catch (error) {
-        throw error
-      }
-    },
-    async processIds(list, interval) {
-      let index = 0
-      const intervalId = setInterval(async () => {
-        if (index < list.length) {
-          const item = list[index]
-          index++
-          const params = await this.getSampleDataById(item['id'])
-          await this.submitData(params)
-        } else {
-          clearInterval(intervalId) // 所有任务完成后清除定时器
-          uni.redirectTo({
-            url: '/pages/analysis/sample/sample-work-detail?currentTaskNo=' + this.currentTaskNo
-          })
-        }
-      }, interval)
-    },
-
-    async apiRequest(url) {
-      return request({
-        url: url,
-        method: 'GET',
-        custom: {
-          isApiEncryption: true
-        }
-      })
-    },
-    //读取字段里的API选项
-    async loadFieldApiData() {
-      const formFields = this.formFields
-      let changeFlag = false
-      for (const field of formFields) {
-        const dicUrl = field.dicUrl
-        const type = field.type
-        if (dicUrl && dicUrl != '') {
-          //读取API选项
-          try {
-            const res = await this.apiRequest(dicUrl)
-
-            const data = res
-            const confLabel = field.props.label
-            const confValue = field.props.value
-            const emptyItem = { name: '', displayName: '' }
-            emptyItem[confLabel] = ''
-            emptyItem[confValue] = ''
-            //设置valueText、displayName
-            for (const item of data) {
-              if (item[confValue] == field.value) {
-                changeFlag = true
-                field.valueText = item[confLabel]
-              }
-            }
-            // data.unshift(emptyItem) //添加空数据
-            field.options = data
-          } catch (e) {}
-        }
-      }
-      if (changeFlag) {
-        const formFields = this.formFields
-        // this.formFields = JSON.parse(JSON.stringify(formFields));
-        this.formFields = JSON.parse(JSON.stringify(formFields, replacer), reviver)
-      }
-    },
-    /*
-     * 选择器组件确认事件
-     * event： 事件默认参数
-     * field： 当前字段
-     * 处理逻辑：
-     *   field.value = 选中的值
-     *   field.valueText = 选中的文本
-     * todo： 关联字段在动态字段的change事件处理
-     * */
-    pickerConfirm(event, field) {
-      const me = this
-      if (field.type == 'date') {
-        field.value = nx.$dayjs(event.value).format(field.format)
-        field.showPicker = false
-        return
-      }
-      const confLabel = field.props.label
-      const confValue = field.props.value
-      const selected = event.value[0]
-      const value = selected[confValue]
-      const displayName = selected[confLabel]
-      field.value = value
-      field.valueText = displayName
-      if (typeof field.change == 'function') {
-        field.change({ value }, selected, me)
-      }
       field.showPicker = false
-    },
-    checkLoadSValue() {
-      const vKey = 'sRange'
-      const vF = this.getFieldByKey(vKey)
-      if (vF == null) return false
-      const v = vF.value
-      if (v == null || v == '') return true
-      try {
-        if (v == 0 || number(v) == 0) return true
-      } catch (e) {}
-      return false
-    },
-    //读取硫值、硫量
-    loadSValue(detail) {
-      let flag = this.checkLoadSValue()
-      if (!flag) return
-      const vKey = 'sValue'
-      const rKey = 'sRange'
-      const vF = this.getFieldByKey(vKey)
-      if (vF != null) {
-        vF.value = detail.svalue
+      if (value == 'curDate') {
+        field.value = nx.$dayjs.format('yyyy-MM-dd')
       }
-      const rF = this.getFieldByKey(rKey)
-      if (rF != null) {
-        rF.value = detail.srange
-      }
-    },
-    getFieldByKey(key) {
-      const group = this.fieldGroup
-      let field = null
-      for (let g of group) {
-        for (let f of g.fields) {
-          const dicKey = f.dicKey
-          if (dicKey && dicKey == key) {
-            field = f
-            break
-          }
+    }
+    if (field.type == 'select') {
+      field.showPicker = false
+    }
+    formFieldsArr.push(field)
+  }
+  //先序列化再转json，避免json里定义的方法丢失
+  formFields.value = JSON.parse(JSON.stringify(formFieldsArr, replacer), reviver)
+}
+
+// 绑定数据（将 formValue 填入字段）
+function bindFormValue() {
+  //formValue
+  for (const field of formFields.value) {
+    const prop = field.prop
+    if (prop) {
+      const value = formValue.value[prop]
+      if (value) {
+        field.value = value
+        if (field.type == 'select') {
+          field.valueText = value
         }
       }
-      // console.log('field', JSON.stringify(field));
-      return field
     }
   }
 }
+
+// 获取表单字段和值（老数据）
+function loadHeadFieldsAndValueByTaskNo() {
+  nx.$api.assayTask
+    .queryHeadValueByTaskNo({ taskNo: currentTaskNo.value })
+    .then(res => {
+      const result = res.result
+      const formConf = result.formConf
+      sourceFormFields.value = eval(formConf)
+      formValue.value = JSON.parse(result.formValue)
+      //加载和处理表单字段
+      assembleFields()
+      //绑定数据
+      bindFormValue()
+      //读取字段里的动态选项
+      loadFieldApiData()
+      console.log('formFields', formFields.value)
+    })
+    .catch(err => {
+      //如果没有查到数据，按配置读取新的表单字段
+      getHeadFields()
+    })
+}
+
+// 获取表单字段（新数据）
+function getHeadFields() {
+  nx.$api.assayTask.queryHeadFieldsByTaskNo({ taskNo: currentTaskNoVal }).then(res => {
+    sourceFormFields.value = analysisFormAndFields(res)
+    //加载和处理表单字段
+    assembleFields()
+    //读取字段里的动态选项
+    loadFieldApiData()
+  })
+}
+
+// 解析表单结构
+function analysisFormAndFields(formRet) {
+  const fieldsArray = []
+  for (const form of formRet) {
+    let content = cloneDeep(form.content)
+    content = eval('(' + content + ')')
+    const column = content.column
+    for (const field of column) {
+      fieldsArray.push(field)
+    }
+  }
+  return fieldsArray
+}
+
+// 将抬头字段值同步保存到明细字段
+function saveHeadValueToDetail(onComplete) {
+  //循环抬头字段，提取需哟保存到明细的字段
+  const conf = []
+  for (const field of formFields.value) {
+    const prop = field.prop
+    const headToDetailField = field.headToDetailField
+    if (prop && headToDetailField && headToDetailField.trim() != '') {
+      const value = field.value
+      const r = {
+        prop: field.prop,
+        value: value,
+        headToDetailField: headToDetailField
+      }
+      conf.push(r)
+    }
+  }
+  const data = {
+    taskNo: currentTaskNo.value,
+    conf: conf
+  }
+  nx.$api.assayTask.saveHeadValueToDetail(data).then(res => {
+    if (onComplete) onComplete()
+  })
+}
+
+// 实际保存逻辑
+function handleSave() {
+  //组装数据
+  const formValueObj = {}
+  for (const field of formFields.value) {
+    const prop = field.prop
+    if (prop) {
+      formValueObj[prop] = field.value
+    }
+  }
+  const value = {
+    taskNo: currentTaskNo.value,
+    formValue: JSON.stringify(formValueObj),
+    formConf: JSON.stringify(sourceFormFields.value, replacer)
+  }
+  nx.$api.assayTask.saveHeadValue(value).then(async res => {
+    await saveHeadValueToDetail(async () => {
+      if (checkPropertyEquality()) {
+        await processIds(sampleList.value, 100)
+      } else {
+        uni.redirectTo({
+          url: '/pages/analysis/sample/sample-work-detail?currentTaskNo=' + currentTaskNo.value
+        })
+      }
+    })
+  })
+}
+
+// 检查字段修改前和修改后字段值是否相等
+function checkPropertyEquality() {
+  for (const field of formFields.value) {
+    const prop = field.prop
+    if (prop && field['headToDetailField'] && field['headToDetailField'].trim() !== '') {
+      const flag = formValue.value[prop] !== field.value ? true : false
+      if (flag) return true
+    }
+  }
+  return false
+}
+
+// 保存抬头字段（带确认弹窗）
+function saveHeadData() {
+  if (checkPropertyEquality()) {
+    uni.showModal({
+      title: '提示',
+      content: '您修改的字段将影响样品分析结果，系统将重新计算',
+      showCancel: false,
+      success: res => {
+        if (res.confirm) {
+          handleSave()
+        }
+      }
+    })
+  } else {
+    handleSave()
+  }
+}
+
+// 通过样品id查询明细
+async function getSampleDataById(taskDetailId) {
+  let fieldGroup = []
+  const { result, additionalProperties } = await nx.$api.assayTask.queryFieldsByTaskDetail({
+    taskDetailId,
+    isSearchSRange: '0'
+  })
+  fieldGroup = result
+  const conAssayTaskId = additionalProperties.conAssayTaskId
+  const busSubCSampleId = additionalProperties.busSubCSampleId
+  const detail = additionalProperties.taskDetail
+  //处理硫值、硫量：未保存过的数据，读取接口返回的硫值、硫量
+  // loadSValue(detail);
+  //按公式计算值，并检查原数据与计算后的数据是否一致
+  try {
+    calcAnalysisValue(fieldGroup)
+  } catch (error) {
+    console.log(error)
+  }
+  let valueList = []
+  let cupNum = 0
+  for (const g of fieldGroup) {
+    for (const f of g.fields) {
+      if (f.dicKey == 'bh' || f.dicKey == 'bh_up') cupNum = f.value
+      valueList.push({
+        id: f.detailId,
+        type: f.pOrE,
+        value: f.value,
+        name: f.name,
+        dataType: f.dataType
+      })
+    }
+  }
+  let params = {
+    busSubCSampleId,
+    conAssayTaskId,
+    // measureTime : this.curSample.measureTime,
+    elementParamValueList: valueList,
+    busAssayTaskDetailId: taskDetailId
+  }
+  if (typeof cupNum != 'undefined' && cupNum != null && cupNum != '' && cupNum != 0 && cupNum != '0') {
+    //提交杯号，保存到后台
+    params.cupNum = cupNum
+  }
+  return params
+}
+
+// 提交样品
+async function submitData(data) {
+  try {
+    await nx.$api.assayTask.saveDetailValue(data)
+  } catch (error) {
+    throw error
+  }
+}
+
+// 批量处理样品（带间隔）
+async function processIds(list, interval) {
+  let index = 0
+  const intervalId = setInterval(async () => {
+    if (index < list.length) {
+      const item = list[index]
+      index++
+      const params = await getSampleDataById(item['id'])
+      await submitData(params)
+    } else {
+      clearInterval(intervalId) // 所有任务完成后清除定时器
+      uni.redirectTo({
+        url: '/pages/analysis/sample/sample-work-detail?currentTaskNo=' + currentTaskNo.value
+      })
+    }
+  }, interval)
+}
+
+// 通用 API 请求
+async function apiRequest(url) {
+  return request({
+    url: url,
+    method: 'GET'
+  })
+}
+
+// 读取字段里的API选项
+async function loadFieldApiData() {
+  const formFieldsVal = formFields.value
+  let changeFlag = false
+  for (const field of formFieldsVal) {
+    const dicUrl = field.dicUrl
+    const type = field.type
+    if (dicUrl && dicUrl != '') {
+      //读取API选项
+      try {
+        const res = await apiRequest(dicUrl)
+
+        const data = res
+        const confLabel = field.props.label
+        const confValue = field.props.value
+        const emptyItem = { name: '', displayName: '' }
+        emptyItem[confLabel] = ''
+        emptyItem[confValue] = ''
+        //设置valueText、displayName
+        for (const item of data) {
+          if (item[confValue] == field.value) {
+            changeFlag = true
+            field.valueText = item[confLabel]
+          }
+        }
+        // data.unshift(emptyItem) //添加空数据
+        field.options = data
+      } catch (e) {}
+    }
+  }
+  if (changeFlag) {
+    // 重新序列化以触发响应式更新（保留函数）
+    formFields.value = JSON.parse(JSON.stringify(formFieldsVal, replacer), reviver)
+  }
+}
+
+/*
+ * 选择器组件确认事件
+ * event： 事件默认参数
+ * field： 当前字段
+ * 处理逻辑：
+ *   field.value = 选中的值
+ *   field.valueText = 选中的文本
+ * todo： 关联字段在动态字段的change事件处理
+ * */
+function pickerConfirm(event, field) {
+  if (field.type == 'date') {
+    field.value = nx.$dayjs(event.value).format(field.format)
+    field.showPicker = false
+    return
+  }
+  const confLabel = field.props.label
+  const confValue = field.props.value
+  const selected = event.value[0]
+  const value = selected[confValue]
+  const displayName = selected[confLabel]
+  field.value = value
+  field.valueText = displayName
+  if (typeof field.change == 'function') {
+    field.change({ value }, selected, { formFields: formFields.value })
+  }
+  field.showPicker = false
+}
+
+// 检查是否需要加载硫值（原逻辑保留）
+function checkLoadSValue() {
+  const vKey = 'sRange'
+  const vF = getFieldByKey(vKey)
+  if (vF == null) return false
+  const v = vF.value
+  if (v == null || v == '') return true
+  try {
+    if (v == 0 || Number(v) == 0) return true
+  } catch (e) {}
+  return false
+}
+
+// 读取硫值、硫量（原逻辑保留，未启用）
+// function loadSValue(detail) {
+//   let flag = checkLoadSValue()
+//   if (!flag) return
+//   const vKey = 'sValue'
+//   const rKey = 'sRange'
+//   const vF = getFieldByKey(vKey)
+//   if (vF != null) {
+//     vF.value = detail.svalue
+//   }
+//   const rF = getFieldByKey(rKey)
+//   if (rF != null) {
+//     rF.value = detail.srange
+//   }
+// }
+
+// 根据 key 获取字段（依赖 fieldGroup，但当前无 fieldGroup，保留原逻辑结构）
+function getFieldByKey(key) {
+  // 注意：原代码中 this.fieldGroup 未定义，此处无法实现，保留函数结构
+  // const group = this.fieldGroup
+  // let field = null
+  // for (let g of group) {
+  //   for (let f of g.fields) {
+  //     const dicKey = f.dicKey
+  //     if (dicKey && dicKey == key) {
+  //       field = f
+  //       break
+  //     }
+  //   }
+  // }
+  // return field
+  return null
+}
+
+// ========== 工具函数（保留原位置） ==========
+
 // 自定义 replacer，将函数转换为字符串。json序列化和反序列化时避免函数丢失
 function replacer(key, value) {
   if (typeof value === 'function') {
@@ -571,6 +572,7 @@ function reviver(key, value) {
   return value
 }
 </script>
+
 <style lang="scss" scoped>
 .navbar-right {
   font-size: 16px;
diff --git a/pages/setting/UrlConfig.vue b/pages/setting/UrlConfig.vue
index a94ff04..7262f37 100644
--- a/pages/setting/UrlConfig.vue
+++ b/pages/setting/UrlConfig.vue
@@ -17,88 +17,88 @@
   </view>
 </template>
 
-<script>
-export default {
-  data() {
-    return {
-      baseUrl: '',
-      tenantId: '',
-      upgradeBaseUrl: '',
-      clickCount: 0, // 初始化点击次数为0
-      threshold: 5, //设置点击次数的阈值
-      thresholdTime: 2, // 设置连续点击的时间阈值（秒）
-      timer: null
-    }
-  },
-  computed: {
-    showContent() {
-      return this.clickCount >= this.threshold
-    }
-  },
+<script setup>
+import { ref, computed, onMounted } from 'vue'
 
-  mounted() {
-    this.baseUrl = uni.getStorageSync('base_url')
-    this.tenantId = uni.getStorageSync('tenant_id')
-    this.upgradeBaseUrl = uni.getStorageSync('upgradeBaseUrl')
-  },
-  methods: {
-    clearCache() {
-      uni.showModal({
-        title: '提示',
-        content: '确定要清空缓存？',
-        success: function (res) {
-          if (res.confirm) {
-            try {
-              uni.clearStorageSync()
-              plus.runtime.restart()
-            } catch (e) {}
-          }
-        }
-      })
-    },
-    submitForm() {
-      if (!this.baseUrl) {
-        uni.showToast({
-          title: '请输入地址和租户',
-          icon: 'none'
-        })
-        return
-      }
-      uni.setStorageSync('base_url', this.baseUrl)
-      uni.setStorageSync('tenant_id', this.tenantId)
-      uni.setStorageSync('upgradeBaseUrl', this.upgradeBaseUrl)
-      uni.showToast({
-        title: '保存成功',
-        icon: 'none'
-      })
-      uni.navigateBack()
-    },
-    handleClick() {
-      // 如果达到阈值，显示内容并重置计数
-      if (this.showContent) {
-        clearTimeout(this.timer)
-        return
-      }
-      // 增加点击次数
-      this.clickCount++
-      uni.showToast({
-        title: `再点击${this.threshold - this.clickCount}次可显示内容`,
-        icon: 'none',
-        duration: 1000
-      })
+// 响应式数据
+const baseUrl = ref('')
+const tenantId = ref('')
+const upgradeBaseUrl = ref('')
+const clickCount = ref(0) // 初始化点击次数为0
+const threshold = 5 // 设置点击次数的阈值
+const thresholdTime = 2 // 设置连续点击的时间阈值（秒）
+let timer = null
 
-      clearTimeout(this.timer)
-      // 清除之前的定时器（如果有），设置新的定时器
-      this.timer = setTimeout(() => {
-        this.resetClickCount()
-      }, this.thresholdTime * 1000)
-    },
-    resetClickCount() {
-      if (!this.showContent) {
-        this.clickCount = 0
+// 计算属性：根据点击次数决定是否显示隐藏内容
+const showContent = computed(() => {
+  return clickCount.value >= threshold
+})
+
+// 页面加载时从缓存中读取已保存的配置
+onMounted(() => {
+  baseUrl.value = uni.getStorageSync('base_url')
+  tenantId.value = uni.getStorageSync('tenant_id')
+  upgradeBaseUrl.value = uni.getStorageSync('upgradeBaseUrl')
+})
+
+// 清除缓存方法
+function clearCache() {
+  uni.showModal({
+    title: '提示',
+    content: '确定要清空缓存？',
+    success: function (res) {
+      if (res.confirm) {
+        try {
+          uni.clearStorageSync()
+          plus.runtime.restart()
+        } catch (e) {}
       }
     }
+  })
+}
+
+// 提交表单：保存配置到缓存
+function submitForm() {
+  if (!baseUrl.value) {
+    uni.showToast({
+      title: '请输入地址和租户',
+      icon: 'none'
+    })
+    return
   }
+  uni.setStorageSync('base_url', baseUrl.value)
+  uni.setStorageSync('tenant_id', tenantId.value)
+  uni.setStorageSync('upgradeBaseUrl', upgradeBaseUrl.value)
+  uni.showToast({
+    title: '保存成功',
+    icon: 'none'
+  })
+  uni.navigateBack()
+}
+
+// 点击标题区域的处理逻辑：用于触发隐藏内容的显示
+function handleClick() {
+  // 如果已经达到阈值，显示内容后不再响应点击
+  if (showContent.value) {
+    clearTimeout(timer)
+    return
+  }
+  // 增加点击次数
+  clickCount.value++
+  uni.showToast({
+    title: `再点击${threshold - clickCount.value}次可显示内容`,
+    icon: 'none',
+    duration: 1000
+  })
+
+  // 清除之前的定时器（如果有），设置新的定时器
+  clearTimeout(timer)
+  timer = setTimeout(() => {
+    // 如果还没达到阈值，则重置点击次数
+    if (!showContent.value) {
+      clickCount.value = 0
+    }
+  }, thresholdTime * 1000)
 }
 </script>