优化

pages/workOrder/detail.vue

@@ -101,8 +101,8 @@
                                 {{ detail.inqualityguaranteeperiod ? '在保' : '已过保' }}
                             </text>
                             {{ detail.cardno || '' }}
-                            <view v-if="detail.cardno && detail.begdate" style="margin-top: 20rpx;">
-                                {{ detail.begdate || '' }} - {{ detail.enddate || '' }}
+                            <view v-if="detail.cardno && detail.cardbegdate" style="margin-top: 20rpx;">
+                                {{ detail.cardbegdate || '' }} - {{ detail.cardenddate || '' }}
                             </view>
                         </view>
                     </view>

pages/workOrder/modules/products.vue

@@ -97,7 +97,7 @@ function previewImge(url) {
 
     .right {
         position: relative;
-        right: 1;
+        flex: 1;
 
         .itemname {
             line-height: 38rpx;

pages/workOrder/work.vue

@@ -1,7 +1,7 @@
 <template>
     <view class="content">
         <up-form :model="form" labelWidth="70" ref="uFormRef" disabled>
-            <block v-if="workpresetjson.questionedit != 0 && workpresetjson.questionoption">
+            <block v-if="workpresetjson.questionedit != 0">
                 <up-form-item label="故障类型" prop="itemtype" :required="workpresetjson.questionedit == 11">
                     <view class="options-box">
                         <view class="option" :class="form.itemtype == item.value ? 'active' : ''"
@@ -179,16 +179,19 @@ let keys = {
     confirm: 'confirm_value', // 确认信息
     itemtype: "questionoption",
     questionedit: "questionedit",
-    passcheck: "passcheck",
 }
+
 // keys 与 form 互相转换字段
 let formToContent = (form) => {
     let content = {};
-    for (let key in keys) {
-        if (form[key]) {
+    for (let key in form) {
+        if (keys[key]) {
             content[keys[key]] = form[key];
+        } else {
+            content[key] = form[key];
         }
     }
+    if (content.amount === '') content.amount = 0;
     return content;
 }
 
@@ -211,12 +214,6 @@ onLoad(() => {
     data = reactive($Http.data);
     delete $Http.data;
 
-    for (let key in keys) {
-        if (data[keys[key]]) {
-            form[key] = data[keys[key]];
-        }
-    }
-
     form.fileupload = data.attinfos.length ? '1' : '';
     uni.setNavigationBarTitle({
         title: data.title,
@@ -254,8 +251,8 @@ onLoad(() => {
             { required: workpresetjson.passcheck == 11, message: '请选择合格确认', trigger: 'change' }
         ],
         amountpay: [
-            { required: workpresetjson.amountpay == 11, message: '请输入费用支付', trigger: 'blur' },
-            { pattern: /^\d+(\.\d{1,2})?$/, message: '请输入正确的金额', trigger: 'blur' }
+            { required: workpresetjson.amountpay == 11, message: '请输入费用支付', trigger: 'blur', validator: (rule, value) => value !== '' },
+            { pattern: /^(0|[1-9]\d*)(\.\d{1,2})?$/, message: '请输入正确的金额', trigger: 'blur' }
         ],
         fileupload: [
             { required: workpresetjson.fileupload == 11, message: '请上传图片', trigger: 'change' }
@@ -270,11 +267,18 @@ onLoad(() => {
         uFormRef.value.setRules(rules);
     });
 
-    if (workpresetjson.questionoption) $Http.getClass(workpresetjson.questionoption).then(res => {
+    if (workpresetjson.questionedit) $Http.getClass(workpresetjson.questionoption).then(res => {
         questionoption.value = res.data;
         if (res.code !== 1) return uni.showToast({ title: res.msg, icon: 'none' });
     })
 
+    for (let key in keys) {
+        if (data[keys[key]]) {
+            form[key] = data[keys[key]];
+            console.log(key, form[key])
+        }
+    }
+
     // 添加表单修改监听
     const originalForm = JSON.parse(JSON.stringify(form));
     watch(form, (newVal) => {
@@ -296,7 +300,7 @@ function submit() {
 
     let traintitem = []
     try {
-        if (from.additem) {
+        if (form.additem != 0) {
             traintitem = data.oldtitems.map(v => {
                 return {
                     itemid: v.itemid,
@@ -306,6 +310,8 @@ function submit() {
                     qty: v.qty || v.packageqty || 1,
                 }
             })
+        } else {
+            traintitem = []
         }
     } catch (error) {
 
@@ -362,8 +368,9 @@ function save() {
     if (loading1.value) return;
     if (upload.value.isUploading()) return;
     let traintitem = []
+    console.log("oldtitems", data.oldtitems)
     try {
-        if (from.additem) {
+        if (form.additem != 0) {
             traintitem = data.oldtitems.map(v => {
                 return {
                     itemid: v.itemid,
@@ -373,8 +380,11 @@ function save() {
                     qty: v.qty || v.packageqty || 1,
                 }
             })
+        } else {
+            traintitem = []
         }
     } catch (error) {
+        console.log(error)
 
     }
     let content = {
@@ -384,6 +394,7 @@ function save() {
         ...formToContent(form),
         traintitem
     };
+    console.log('content', content)
     loading1.value = true;
     $Http.basic({
         "id": "20230209094203",
@@ -426,6 +437,7 @@ function clickRadio(value, key) {
         form.oldtitems = data.oldtitems.length ? '1' : '';
         uFormRef.value.setRules(rules);
     }
+    console.log("form", form)
 }
 
 function uploadCallback(list) {

utils/Http.js

@@ -19,9 +19,13 @@ class HTTP {
 
         //得到缩略图或者压缩图  getType默认得到缩略图传true得到压缩图
         this.getSpecifiedImage = (obj, getType = false) => {
-            let type = getType ? 'compressed' : 'thumbnail';
-            let imgObj = obj.subfiles.find(v => v.type == type);
-            return imgObj.url;
+            try {
+                let type = getType ? 'compressed' : 'thumbnail';
+                let imgObj = obj.subfiles.find(v => v.type == type);
+                return imgObj.url || obj.url;
+            } catch (error) {
+                return obj.url;
+            }
         }
 
         if (process.env.NODE_ENV === 'development') {