0.0.73设备管理修改返回键问题

src/pages/equipment/Inspection/details.vue

@@ -462,10 +462,10 @@ export default class ChangePalletNew extends BasePage {
         type: 'default',
       });
       setTimeout(() => {
-        // uni.navigateBack({});
-        uni.redirectTo({
-          url: `/pages/equipment/Inspection/index`,
-        });
+        uni.navigateBack({});
+        // uni.redirectTo({
+        //   url: `/pages/equipment/Inspection/index`,
+        // });
       }, 1000);
     } else {
       (this.$refs.uToast as any).show({

src/pages/equipment/Spotcheck/details.vue

@@ -362,12 +362,6 @@ export default class ChangePalletNew extends BasePage {
     });
   }
   async onSubmit() {
-    // setTimeout(() => {
-    //     uni.navigateBack({});
-    //     // uni.redirectTo({
-    //     //   url: `/pages/equipment/Spotcheck/index?listitem=`,
-    //     // });
-    //   }, 1000);
     if (this.orderNo == '' || this.orderNo.length == 0) {
       // this.customToast('请扫码设备编码');
       (this.$refs.uToast as any).show({
@@ -404,10 +398,7 @@ export default class ChangePalletNew extends BasePage {
       });
 
       setTimeout(() => {
-        // uni.navigateBack({});
-        uni.redirectTo({
-          url: `/pages/equipment/Spotcheck/index?listitem=`,
-        });
+        uni.navigateBack({});
       }, 1000);
     } else {
       (this.$refs.uToast as any).show({

src/pages/equipment/Spotcheck/index.vue

@@ -27,7 +27,6 @@
       <div class="item1">创建时间: {{ item.createTime }}</div>
       <div class="item1">循环执行时间开始: {{ item.planLoopStart }}</div>
     </view>
-
     <view class="list" v-show="current != 0" v-for="(item, index) in detailsdata" :key="index" @click="linkdetailscheck(item, isorderNo)">
       <div class="list-top">
         <div class="name">工单号: {{ item.orderCode }}</div>

src/pages/equipment/Upkeep/repairing.vue

@@ -635,9 +635,6 @@ export default class ChangePalletNew extends BasePage {
       });
 
       setTimeout(() => {
-        // uni.redirectTo({
-        //   url: `/pages/equipment/Upkeep/index?listitem=`,
-        // });
         uni.navigateBack({});
       }, 1000);
     } else {

src/pages/login/login/index.vue

@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.72'; //正式版本号
+  version = '0.0.73'; //正式版本号
   //version = '0.0.3'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;

src/pages/quality/Materialinspection/index.vue

@@ -66,6 +66,12 @@
                 <view> {{ item.checkLocName }} </view>
               </view>
             </view>
+            <view class="row-list">
+              <view class="row-list-item">
+                <view class="list-item"> 供应商单位: </view>
+                <view> {{ item.supplierName }} </view>
+              </view>
+            </view>
             <view a:if="true" class="righttitle">
               <view @click.stop="onPass(item)" class="boder-icon-rigth"> 处理 </view>
             </view>
@@ -98,6 +104,9 @@
             <div class="details">
               <div>检验位置 : {{ clickitem.checkLocName }}</div>
             </div>
+            <div class="details">
+              <div>供应商单位 : {{ clickitem.supplierName }}</div>
+            </div>
           </div>
           <!-- <div style="text-align: center">
             <u-button style="width: 100%; height: 35px; margin: auto" @click="onOk" size="mini" type="primary">同步信息</u-button>
@@ -199,18 +208,19 @@
                 </u-radio>
               </u-radio-group>
             </u-form-item>
+            <u-form-item label="是否发起oa:">
+              <u-radio-group v-model="formdata.startOA">
+                <u-radio v-for="(n, indexn) in listselectoa" :key="indexn" :name="n.type" :disabled="n.disabled">
+                  {{ n.name }}
+                </u-radio>
+              </u-radio-group>
+            </u-form-item>
             <div v-show="formdata.checkResult == 'N'">
-              <u-form-item label="是否发起oa:">
-                <u-radio-group v-model="formdata.startOA">
-                  <u-radio v-for="(n, indexn) in listselectoa" :key="indexn" :name="n.type" :disabled="n.disabled">
-                    {{ n.name }}
-                  </u-radio>
-                </u-radio-group>
-              </u-form-item>
-
               <u-form-item label="不合格描述:">
                 <u-input style="background: #fafafa; border: 1px dashed #e2e2e2; padding: 10px 5px" v-model="formdata.remark" placeholder="" type="textarea" />
               </u-form-item>
+            </div>
+            <div v-show="formdata.startOA == '1'">
               <u-form-item label="来料类别:">
                 <jPicker sureColor="#ff0000" :moren="moren5" @bindpicker="selectProductlocCode4" showKey="label" valKey="value" :val="selectmaterialType.value" :options="model.locList2" />
               </u-form-item>