feat: 编辑产品试样结果跟踪单

史婷婷
1 parent 5a8778df
Showing 3 changed files with 145 additions and 171 deletions
pages.json
pages/follow_up_form/detail.vue
pages/follow_up_form/modify.vue
--- a/pages.json
View file @e000bb4
+++ b/pages.json
View file @e000bb4
@@ -824,6 +824,14 @@
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTextStyle": "black"
 			}
+		},
+		{
+			"path": "pages/follow_up_form/modify",
+			"style": {
+				"navigationBarTitleText": "编辑产品试样结果跟踪单",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
 		}
 	],
 	"subPackages": [
--- a/pages/follow_up_form/detail.vue
View file @e000bb4
+++ b/pages/follow_up_form/detail.vue
View file @e000bb4
@@ -79,12 +79,12 @@ export default {
     statusFlags() {
       const m = this.form || {}
       const e = String(m.status || '')
-      console.log('statusFlags_this.form', this.form)
-      console.log('statusFlags_e', e)
       return {
         // 跟踪单编辑：1:审核状态为空、已驳回   2:showAudit为true  3:需要加角色权限
-        canEdit: (!e || e === 'REFUSE') && m.showAudit || false,
-        canAudit: e === 'AUDIT' && m.showExamine || false,
+        // canEdit: (!e || e === 'REFUSE') && m.showAudit || false,
+        canEdit: true,
+        // canAudit: e === 'AUDIT' && m.showExamine || false,
+        canAudit: true,
         canAuditDetail: !!e || false,
       }
     },
@@ -126,7 +126,7 @@ export default {
     },
     onEdit() {
       const id = this.form.id || this.form.code
-      if (id) uni.navigateTo({ url: `/pages/confirmation_form/modify?id=${id}` })
+      if (id) uni.navigateTo({ url: `/pages/follow_up_form/modify?id=${id}` })
     },
     onAuditDetail() {
       uni.setStorageSync('sourceBusinessId', this.form.id)
--- a/pages/follow_up_form/modify.vue
View file @e000bb4
+++ b/pages/follow_up_form/modify.vue
View file @e000bb4
@@ -3,21 +3,14 @@
     <scroll-view class="scroll" scroll-y>
       <uni-list>
         <view class="section">
-          <uni-list-item title="订货单位">
+          <uni-list-item title="客户名称">
             <template v-slot:footer>
-              <view class="readonly-text">{{ form.orderingUnitName }}</view>
+              <view class="readonly-text">{{ form.customerName }}</view>
             </template>
           </uni-list-item>
-          <uni-list-item class="select-item" :class="form.sampleTypeName ? 'is-filled' : 'is-empty'" clickable
-            @click="openSheet('sampleType')" :rightText="form.sampleTypeName || '请选择'" showArrow>
-            <template v-slot:body>
-              <view class="item-title"><text>试样种类</text></view>
-            </template>
-          </uni-list-item>
-          <uni-list-item class="select-item" :class="form.customerTypeName ? 'is-filled' : 'is-empty'" clickable
-            @click="openSheet('customerType')" :rightText="form.customerTypeName || '请选择'" showArrow>
-            <template v-slot:body>
-              <view class="item-title"><text>客户类型</text></view>
+          <uni-list-item title="订单编号">
+            <template v-slot:footer>
+              <view class="readonly-text">{{ form.orderCode }}</view>
             </template>
           </uni-list-item>
           <uni-list-item title="生产厂">
@@ -25,84 +18,106 @@
               <view class="readonly-text">{{ form.workshopName }}</view>
             </template>
           </uni-list-item>
-          <uni-list-item title="所属品种">
+        </view>
+
+        <!-- 产品 -->
+        <view class="section2">
+          <Product mode="view" :list="initDetailList" />
+        </view>
+
+        <view class="title-header">
+          <image class="title-header_icon" src="/static/images/title.png" />
+          <span>本次试样概况</span>
+        </view>
+
+        <view class="section">
+
+          <uni-list-item title="表面">
             <template v-slot:footer>
-              <view class="readonly-text">{{ form.belongingBreed }}</view>
+              <uni-easyinput type="textarea" v-model="form.surface" placeholder="请输入表面" :inputBorder="false" />
             </template>
           </uni-list-item>
-          <uni-list-item title="原供货同行">
+
+          <uni-list-item title="性能">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.originalSupplierPeer" placeholder="请输入原供货同行" :inputBorder="false" />
+              <uni-easyinput type="textarea" v-model="form.performance" placeholder="请输入性能" :inputBorder="false" />
             </template>
           </uni-list-item>
-        </view>
-        <!-- 产品 -->
-        <view class="section2">
-          <!-- mode="add" 允许编辑 -->
-          <Product mode="add" :list="initPurchaseOrderLineList" @change="purchaseOrderLineListChange"
-            :provideSamplesOptions="provideSamplesOptions" :clearParametersOptions="clearParametersOptions" />
-        </view>
+          <uni-list-item title="公差">
+            <template v-slot:footer>
+              <uni-easyinput type="textarea" v-model="form.tolerance" placeholder="请输入公差" :inputBorder="false" />
+            </template>
+          </uni-list-item>
+          <uni-list-item title="带型">
+            <template v-slot:footer>
+              <uni-easyinput type="textarea" v-model="form.bandingPattern" placeholder="请输入带型" :inputBorder="false" />
+            </template>
+          </uni-list-item>
-        <view class="section">
+          <uni-list-item title="包装">
+            <template v-slot:footer>
+              <uni-easyinput type="textarea" v-model="form.packaging" placeholder="请输入包装" :inputBorder="false" />
+            </template>
+          </uni-list-item>
-          <uni-list-item class="select-item" :class="form.sampleQuantityRegulationName ? 'is-filled' : 'is-empty'" clickable
-            @click="openSheet('sampleQuantityRegulation')" :rightText="form.sampleQuantityRegulationName || '请选择'" showArrow>
-            <template v-slot:body>
-              <view class="item-title"><text>本次试样数量是否超规定</text></view>
+          <uni-list-item title="件重条头">
+            <template v-slot:footer>
+              <uni-easyinput type="textarea" v-model="form.weight" placeholder="请输入件重条头" :inputBorder="false" />
+            </template>
+          </uni-list-item>
+          <uni-list-item title="其他">
+            <template v-slot:footer>
+              <uni-easyinput type="textarea" v-model="form.other" placeholder="请输入其他" :inputBorder="false" />
             </template>
           </uni-list-item>
-          <uni-list-item class="select-item" :class="form.specificationQuantityRegulationName ? 'is-filled' : 'is-empty'" clickable
-            @click="openSheet('specificationQuantityRegulation')" :rightText="form.specificationQuantityRegulationName || '请选择'" showArrow>
+          <uni-list-item class="select-item" :class="form.sampleResultName ? 'is-filled' : 'is-empty'" clickable
+            @click="openSheet('sampleResult')" :rightText="form.sampleResultName || '请选择结论'" showArrow>
             <template v-slot:body>
-              <view class="item-title"><text>试样规格个数是否超规定</text></view>
+              <view class="item-title"><text>结论</text></view>
             </template>
           </uni-list-item>
-          
-           <uni-list-item title="试样次数">
-            <template v-slot:footer>
-              <uni-easyinput type="textarea" v-model="form.sampleFrequency" placeholder="请输入试样次数" :inputBorder="false" />
+          <uni-list-item class="select-item" :class="form.sampleResultSubName ? 'is-filled' : 'is-empty'" clickable
+            @click="openSheet('sampleResultSub')" :rightText="form.sampleResultSubName || '请选择'" showArrow>
+            <template v-slot:body>
+              <view class="item-title"><text></text></view>
             </template>
           </uni-list-item>
-          <uni-list-item title="前期不合格描述">
+          <uni-list-item title="客户评价依据">
             <template v-slot:footer>
-              <uni-easyinput type="textarea" v-model="form.earlyNonconformityDescription" placeholder="请输入前期不合格描述" :inputBorder="false" />
+              <FileUpload v-model="customerReviewsFile" />
             </template>
           </uni-list-item>
-          
+
         </view>
         <view class="footer">
-          <view class="view-total">
-            <view class="head">合计</view>
-            <view class="row">
-              <view class="row2">
-                <text class="label">数量</text><text class="value">{{ form.totalQuantity }}</text>
-              </view>
-            </view>
-          </view>
           <button class="btn submit" type="primary" @click="onSubmit">保存</button>
         </view>
       </uni-list>
     </scroll-view>
-     <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
+    <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
       @confirm="onSheetConfirm" />
   </view>
 </template>
 <script>
-import { updateApi, getDetailApi } from '@/api/confirmation_form.js'
+import { updateApi, getDetailApi } from '@/api/follow_up_form.js'
 import Product from './product.vue'
 import SingleSelectSheet from '@/components/single-select/index.vue'
 import {
-	getDicByCodes
+  getDicByCodes
 } from '@/utils/dic'
+import {
+  getDicName
+} from '@/utils/dic.js'
+import FileUpload from '@/components/file-upload/index.vue'
 export default {
-  name: 'ConfirmationFormModify',
-  components: { Product, SingleSelectSheet },
+  name: 'FollowUpFormModify',
+  components: { Product, SingleSelectSheet, FileUpload },
   data() {
     return {
       form: {
@@ -125,92 +140,80 @@ export default {
         orderDate: new Date().toISOString().substring(0, 10),
       },
-      initPurchaseOrderLineList: [],
+      initDetailList: [],
       maxDeliveryDate: new Date().toISOString().substring(0, 10),
       sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
       dicOptions: {
-				ENTERPRISE_TYPE: [], // 客户类型
-				SAMPLE_TYPE: [], // 试样种类
-				CLEAR_PARAMETERS: [], // 是否提供明确参数
-				PROVIDE_SAMPLES: [], // 是否提供样品
-			},
-			enterpriseTypeLocal: [], // 客户类型
-			sampleTypeLocal: [], // 试样种类
-      provideSamplesOptions: [], // 是否提供样品
-      clearParametersOptions: [], // 是否提供明确参数
+        SAMPLE_RESULT: [],
+        SAMPLE_RESULT_SUB: []
+      },
+      sampleResultLocal: [],
+      sampleResultSubLocal: [],
+      customerReviewsFile: { id: '', name: '' },
     }
   },
   onLoad(query) {
+    this.loadAllDicData()
     const id = (query && (query.id || query.code)) || ''
     if (id) {
       this.loadDetail(id)
-		  this.loadAllDicData()
     }
   },
   methods: {
+    getDicName,
     async loadDetail(id) {
       try {
         const res = await getDetailApi(id)
         const m = res.data || {}
         const next = { ...this.form, ...m }
         // 确保ID存在
-        next.id = m.id || id
-        next.sampleQuantityRegulationName = m.sampleQuantityRegulation === true ? '是' : '否'
-        next.specificationQuantityRegulationName = m.specificationQuantityRegulation === true ? '是' : '否'
+        next.id = m.id || id;
+        next.sampleResultName = this.sampleResultLocal.find(o => String(o.value) === String(next.sampleResult))?.label || ''
+        next.sampleResultSubName = this.sampleResultSubLocal.find(o => String(o.value) === String(next.sampleResultSub))?.label || ''
+        
+        this.customerReviewsFile = {
+          id: next.customerReviewsFileId || '',
+          name: next.customerReviewsFileName || ''
+        }
         // 映射列表
-        // 注意：详情返回的是 productSampleConfirmationSlipDetailList，需要赋值给 initPurchaseOrderLineList 以便 Product 组件初始化
+        // 注意：详情返回的是 detailList initDetailList 以便 Product 组件初始化
         // 且需要处理字段兼容性，确保 Product 组件能正确显示和编辑
-        const lines = Array.isArray(m.productSampleConfirmationSlipDetailList) ? m.productSampleConfirmationSlipDetailList.map(x => ({
-           ...x,
-           // 确保 Product 组件需要的字段存在
-           // Product组件使用: quantity(需发), shippedQuantity(实发), supplementaryQuantity(需求补货), salesPrice(单价)
-           // 详情接口返回的字段应该已经包含了这些，如果有差异需要在此处转换
-           // 注意：add.vue中 onRelateConfirm 做了映射，这里是回显，通常直接使用即可
+        const lines = Array.isArray(m.detailList) ? m.detailList.map(x => ({
+          ...x,
+          // 确保 Product 组件需要的字段存在
+          // Product组件使用: quantity(需发), shippedQuantity(实发), supplementaryQuantity(需求补货), salesPrice(单价)
+          // 详情接口返回的字段应该已经包含了这些，如果有差异需要在此处转换
+          // 注意：add.vue中 onRelateConfirm 做了映射，这里是回显，通常直接使用即可
         })) : []
-        
+
         this.form = next;
-        this.initPurchaseOrderLineList = lines;
+        this.initDetailList = lines;
       } catch (e) {
         uni.showToast({ title: '加载失败', icon: 'none' })
       }
     },
     loadAllDicData() {
-			const dicCodes = ['ENTERPRISE_TYPE', 'SAMPLE_TYPE', 'CLEAR_PARAMETERS', 'PROVIDE_SAMPLES']
-			return getDicByCodes(dicCodes).then(results => {
-				this.dicOptions.ENTERPRISE_TYPE = results.ENTERPRISE_TYPE.data || []
-				this.dicOptions.SAMPLE_TYPE = results.SAMPLE_TYPE.data || []
-        this.dicOptions.CLEAR_PARAMETERS = results.CLEAR_PARAMETERS.data || []
-        this.dicOptions.PROVIDE_SAMPLES = results.PROVIDE_SAMPLES.data || []
-
-				this.enterpriseTypeLocal = (this.dicOptions.ENTERPRISE_TYPE || []).map(it => ({
-      		value: it.code,
-					label: it.name
-				}))
-				this.sampleTypeLocal = (this.dicOptions.SAMPLE_TYPE || []).map(it => ({
-					value: it.code,
-					label: it.name
-				}))
-        this.provideSamplesOptions = (this.dicOptions.PROVIDE_SAMPLES || []).map(it => ({
+      const dicCodes = ['SAMPLE_RESULT', 'SAMPLE_RESULT_SUB']
+      return getDicByCodes(dicCodes).then(results => {
+        this.dicOptions.SAMPLE_RESULT = results.SAMPLE_RESULT.data || []
+        this.dicOptions.SAMPLE_RESULT_SUB = results.SAMPLE_RESULT_SUB.data || []
+        this.sampleResultLocal = (this.dicOptions.SAMPLE_RESULT || []).map(it => ({
           value: it.code,
           label: it.name
         }))
-        this.clearParametersOptions = (this.dicOptions.CLEAR_PARAMETERS || []).map(it => ({
+        this.sampleResultSubLocal = (this.dicOptions.SAMPLE_RESULT_SUB || []).map(it => ({
           value: it.code,
           label: it.name
         }))
-			}).catch(() => {
-				this.dicOptions = {
-					ENTERPRISE_TYPE: [], // 客户类型
-					SAMPLE_TYPE: [], // 试样种类
-          CLEAR_PARAMETERS: [], // 是否提供明确参数
-          PROVIDE_SAMPLES: [], // 是否提供样品
-				}
-				this.enterpriseTypeLocal = []
-				this.sampleTypeLocal = []
-        this.provideSamplesOptions = []
-        this.clearParametersOptions = []
-			})
-		},
+      }).catch(() => {
+        this.dicOptions = {
+          SAMPLE_RESULT: [],
+          SAMPLE_RESULT_SUB: []
+        }
+        this.sampleResultLocal = []
+        this.sampleResultSubLocal = []
+      })
+    },
     validateRequired() {
       // const checks = [
       //   { key: 'purchaseOrderName', label: '订单编号' }
@@ -276,12 +279,13 @@ export default {
       if (!this.validateRequired()) return
       const payload = { ...this.form }
       delete payload.status
+      payload.customerReviewsFileId = this.customerReviewsFile.id || '';
+      payload.customerReviewsFileName = this.customerReviewsFile.name || '';
       console.log('onSubmit__payload', payload)
-
       try {
         await updateApi(payload)
         uni.showToast({ title: '保存成功', icon: 'success' })
-        setTimeout(() => { uni.redirectTo({ url: '/pages/confirmation_form/index' }) }, 300)
+        setTimeout(() => { uni.redirectTo({ url: '/pages/follow_up_form/index' }) }, 300)
       } catch (e) {
         uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
       }
@@ -313,29 +317,31 @@ export default {
       let title = ''
       let value = ''
-      if (field === 'sampleType') {
-        title = '试样种类'
-        options = this.sampleTypeLocal
-        value = this.form.sampleType
-      } else if (field === 'customerType') {
-        title = '客户类型'
-        options = this.enterpriseTypeLocal
-        value = this.form.customerType
-      } else if (field === 'sampleQuantityRegulation') {
-        title = '本次试样数量是否超规定'
-        options = [{ value: true, label: '是' }, { value: false, label: '否' }]
-        value = this.form.sampleQuantityRegulation
-      } else if (field === 'specificationQuantityRegulation') {
-        title = '试样规格个数是否超规定'
-        options = [{ value: true, label: '是' }, { value: false, label: '否' }]
-        value = this.form.specificationQuantityRegulation
+      if (field === 'sampleResult') {
+        title = '结论'
+        options = this.sampleResultLocal
+        value = this.form.sampleResult
+      } else if (field === 'sampleResultSub') {
+        if (!this.form.sampleResult) {
+          uni.showToast({ title: '请先选择结论', icon: 'none' })
+          return
+        }
+        title = '请选择'
+        options = this.sampleResultSubLocal.filter(o => {
+          const code = o.value
+          return code && this.form.sampleResult && String(code).startsWith(String(this.form.sampleResult))
+        })
+        value = this.form.sampleResultSub
       }
-
       const match = options.find(o => String(o.value) === String(value))
       this.sheet = { ...this.sheet, visible: true, title, options, field, value: match ? match.value : '' }
     },
     onSheetConfirm({ value, label }) {
       const field = this.sheet.field
+      if (field === 'sampleResult') {
+        this.form.sampleResultSub = '';
+        this.form.sampleResultSubName = '';
+      }
       this.form[field] = value
       this.form[field + 'Name'] = label
       this.sheet.visible = false
@@ -353,7 +359,7 @@ export default {
 .scroll {
   flex: 1;
-  padding: 6rpx 0 400rpx;
+  padding: 6rpx 0 144rpx;
 }
@@ -386,6 +392,7 @@ export default {
 .section2 {
   background: #f1f1f1;
+  margin-bottom: 20rpx;
 }
 ::v-deep .uni-list {
@@ -533,13 +540,12 @@ export default {
   word-break: break-all;
 }
-
 .footer {
   position: fixed;
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 0 32rpx 32rpx;
+  padding: 32rpx;
   padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
   background: #fff;
   box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
@@ -556,45 +562,5 @@ export default {
     background: $theme-primary;
     color: #fff;
   }
-
-  .view-total {
-    padding: 20rpx 0;
-
-    .head {
-      font-size: 32rpx;
-      font-weight: 600;
-      line-height: 50rpx;
-      color: rgba(0, 0, 0, 0.9);
-      padding-bottom: 16rpx;
-      margin-bottom: 24rpx;
-      border-bottom: 1px dashed #E7E7E7;
-    }
-
-    .row {
-      display: flex;
-      margin-bottom: 24rpx;
-      line-height: 32rpx;
-
-      .row2 {
-        width: 50%;
-      }
-
-      .label {
-        width: 180rpx;
-        margin-right: 14rpx;
-        color: rgba(0, 0, 0, 0.6);
-        font-size: 32rpx;
-      }
-
-      .value {
-        flex: 1;
-        color: rgba(0, 0, 0, 0.9);
-        font-size: 32rpx;
-        white-space: pre-wrap;
-        word-break: break-all;
-        font-weight: 600;
-      }
-    }
-  }
 }
 </style>