xiaohaizhao 3 meses atrás
pai
commit
e2e48a8a04
5 arquivos alterados com 32 adições e 31 exclusões
  1. 1 1
      manifest.json
  2. 1 2
      pages/login/login.vue
  3. 23 22
      pages/workOrder/changeMsg.vue
  4. 4 3
      pages/workOrder/detail.vue
  5. 3 3
      utils/Http.js

+ 1 - 1
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "美大服务工人小程序",
+    "name" : "美大服务小程序",
     "appid" : "__UNI__0BCE2F5",
     "description" : "",
     "versionName" : "1.0.0",

+ 1 - 2
pages/login/login.vue

@@ -168,7 +168,7 @@ function handleLogin(data) {
         "id": 2025072809441203,
         "content": {
             "customerphone": phonenumber.value,
-            siteid: data.siteid
+            siteid: data.siteid || 'MD'
         }
     }).then(res => {
         console.log("登录结果:", res);
@@ -209,7 +209,6 @@ const isAgreement = ref(false);
 const showModal = ref(false);
 
 function checkTheAgreement() {
-    console.log(122222222222222222)
     uni.showLoading({
         title: "加载中...",
     });

+ 23 - 22
pages/workOrder/changeMsg.vue

@@ -21,14 +21,14 @@
                 </up-radio-group>
             </up-form-item>
 
-            <up-form-item v-if="rules.class2[0].required" label="故障类型" :required="rules.class2[0].required"
+            <!--      <up-form-item v-if="rules.class2[0].required" label="故障类型" :required="rules.class2[0].required"
                 prop="class2">
                 <up-radio-group v-model="form.class2">
                     <up-radio :customStyle="{ marginLeft: '12px' }" v-for="(item) in class2" :key="item.value"
                         :label="item.value" :name="item.value">
                     </up-radio>
                 </up-radio-group>
-            </up-form-item>
+            </up-form-item> -->
 
             <up-form-item label="服务地址" :required="rules.province[0].required" prop="province">
                 <picker class="picker" mode="region" :value="[form.province, form.city, form.county]"
@@ -57,9 +57,9 @@
             </view>
 
             <up-form-item label="序列号" :required="rules.sku[0].required" prop="sku">
-                <up-input v-model="form.sku" :disabled="detail.sku" placeholder="序列号" clearable @blur="skuConfirm">
+                <up-input v-model="form.sku" placeholder="序列号" clearable @blur="skuConfirm">
                     <template #suffix>
-                        <up-icon v-if="!detail.sku" name="scan" color="#2979ff" size="28" @click="openScan" />
+                        <up-icon name="scan" color="#2979ff" size="28" @click="openScan" />
                     </template>
                 </up-input>
             </up-form-item>
@@ -79,13 +79,13 @@
                 <up-textarea maxlength="499" v-model="form.serviceenterprisename" disabled placeholder="经销商" autoHeight
                     height="20" />
             </up-form-item>
-            <up-form-item label="客户名称" prop="contact">
-                <up-input v-model="form.contact" disabled placeholder="客户名称" />
+            <up-form-item label="客户名称" prop="customername">
+                <up-input v-model="form.customername" disabled placeholder="客户名称" />
             </up-form-item>
-            <up-form-item label="客户电话" prop="phonenumber">
-                <up-input v-model="form.phonenumber" :disabled="detail.sku" placeholder="客户电话">
+            <up-form-item label="客户电话" prop="customerphonenumber">
+                <up-input v-model="form.customerphonenumber" placeholder="客户电话">
                     <template #suffix>
-                        <up-button v-if="!detail.sku" type="success" :disabled="!form.phonenumber" size="mini" text="查询"
+                        <up-button type="success" :disabled="!form.customerphonenumber" size="mini" text="查询"
                             @click="phonenumberConfirm" />
                     </template>
                 </up-input>
@@ -146,12 +146,12 @@ const form = reactive({
     scenecontact: '', // 联系人
     scenecontactphonenumber: '', // 联系人电话
     sku: '', // 序列号
-    'contact': "", // 客户名称
+    'customername': "", // 客户名称
+    'customerphonenumber': "", // 客户电话
     'itemid': "", //    产品ID
     'itemname': "", // 产品名称
     'itemno': "", // 产品编号
     'model': "", // 型号
-    'phonenumber': "", // 客户电话
     'unitname': "", // 计量单位
     'spec': "", // 规格
     serviceenterprisename: "", //  经销商
@@ -215,8 +215,8 @@ function save() {
                 sa_serviceorderid: detail.sa_serviceorderid,
                 ...form
             };
-            content.customername = content.customername || content.contact;
             content.customerphonenumber = content.customerphonenumber || content.phonenumber;
+            content.name = content.customername || '';
             content.sa_customersid = content.sa_customersid || 0;
             loading.value = true;
             $Http.basic({
@@ -263,7 +263,7 @@ let querySku = ref(true); // SKU是否正确
 
 function skuConfirm() {
     if (form.sku) {
-        ['contact', 'serviceenterprisename', "customername", 'customerphonenumber', 'sa_customersid', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
+        ['serviceenterprisename', "customername", 'customerphonenumber', 'sa_customersid', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
             form[key] = '';
         });
         $Http.basic({
@@ -284,9 +284,10 @@ function skuConfirm() {
                 return;
             }
             querySku.value = true;
-            res.data[0].contact = res.data[0].name;
+            res.data[0].customername = res.data[0].customername || res.data[0].name;
+            res.data[0].customerphonenumber = res.data[0].customerphonenumber || res.data[0].phonenumber;
             res.data[0].serviceenterprisename = res.data[0].serviceenterprisename || res.data[0].enterprisename;
-            ['contact', "customername", 'customerphonenumber', 'sa_customersid', 'phonenumber', 'serviceenterprisename', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'unitname', 'spec'].forEach(key => {
+            ["customername", 'customerphonenumber', 'sa_customersid', 'phonenumber', 'serviceenterprisename', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'unitname', 'spec'].forEach(key => {
                 form[key] = res.data[0][key] || '';
             });
             uni.showToast({ title: '已填充表单', icon: 'none' });
@@ -301,7 +302,8 @@ function closePopup() {
     products.value = [];
 }
 function changeItem(item) {
-    item.contact = item.name;
+    item.customername = item.customername || item.name;
+    item.customerphonenumber = item.customerphonenumber || item.phonenumber;
 
     if (item.itemid == detail.itemid) {
         handle();
@@ -317,7 +319,7 @@ function changeItem(item) {
 
     function handle() {
         item.serviceenterprisename = item.serviceenterprisename || item.enterprisename;
-        ['contact', 'serviceenterprisename', "customername", 'customerphonenumber', 'sa_customersid', 'sku', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
+        ['serviceenterprisename', "customername", 'customerphonenumber', 'sa_customersid', 'sku', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
             form[key] = item[key] || '';
         });
         uni.showToast({ title: '已填充表单', icon: 'none' });
@@ -328,8 +330,8 @@ function changeItem(item) {
 
 function phonenumberConfirm() {
     // 校验手机号
-    let reg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/;
-    if (!reg.test(form.phonenumber)) {
+    const phoneRegex = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/;
+    if (!phoneRegex.test(form.customerphonenumber)) {
         return uni.showToast({ title: '请输入正确的手机号', icon: 'none' });
     }
     $Http.basic({
@@ -337,9 +339,8 @@ function phonenumberConfirm() {
         "content": {
             "pageNumber": 1,
             "pageSize": 50,
-            phonenumber: form.phonenumber,
             "where": {
-                // phonenumber: form.phonenumber,
+                phonenumber: form.customerphonenumber,
             }
         }
     }).then(res => {
@@ -380,7 +381,7 @@ function toSelectProduct() {
         url: '/pages/select/product'
     });
     $Http.onSelected = (item) => {
-        ['contact', 'serviceenterprisename', 'sku', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
+        ['serviceenterprisename', 'sku', 'cardno', 'itemid', 'itemname', 'itemno', 'model', 'phonenumber', 'unitname', 'spec'].forEach(key => {
             form[key] = item[key] || '';
         });
         uni.navigateBack()

+ 4 - 3
pages/workOrder/detail.vue

@@ -21,7 +21,7 @@
             </view>
             <view class="row" v-if="detail.servicetype == '维修'">
                 <view class="label">故障类型</view>
-                <view class="value">{{ detail.reason || '--' }}</view>
+                <view class="value">{{ detail.class2 || '--' }}</view>
             </view>
             <view class="row">
                 <view class="label">服务地址</view>
@@ -101,8 +101,8 @@
                                 {{ detail.inqualityguaranteeperiod ? '在保' : '已过保' }}
                             </text>
                             {{ detail.cardno || '' }}
-                            <view v-if="detail.cardno" style="margin-top: 20rpx;">
-                                {{ item.begdate || '' }} - {{ item.enddate || '' }}
+                            <view v-if="detail.cardno && detail.begdate" style="margin-top: 20rpx;">
+                                {{ detail.begdate || '' }} - {{ detail.enddate || '' }}
                             </view>
                         </view>
                     </view>
@@ -221,6 +221,7 @@ function getDetail() {
         } catch (error) {
 
         }
+
         if (res.data.status == '进行中' && detail.servicetype == '') transition.value = false;
         time.value = new Date().getTime()
         detail = reactive(res.data);

+ 3 - 3
utils/Http.js

@@ -2,10 +2,10 @@ class HTTP {
     constructor() {
         this.urls = [{
             name: '测试',
-            url: "http://61.164.207.46:8300"
-        }, {
-            name: '正式',
             url: "https://crm.meida.com:16691"
+        }, {
+            name: '8300',
+            url: "http://61.164.207.46:8300"
         }, {
             name: "楚楚",
             url: "https://cucu.cnyunl.com:8079"