4/8 1.0

src/views/collect/DealOrder.vue

@@ -1035,13 +1035,13 @@ export default {
             this.findCurOrder()
           }
         } else if (res.code == 502) {
+          loading.close();
           this.$confirm(res.message, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
             this.formData.confirmFinish = true
-            loading.close();
             this.finishOrder()
             this.reset()
           }).catch(() => {

src/views/collect/IoReturncllectOrder.vue

@@ -54,48 +54,48 @@
           <!--              <el-button type="primary" @click="toggleBusType" style="margin-left: 5px">切换业务</el-button>-->
           <!--            </el-form-item>-->
           <!--          </el-col>-->
-          <el-col :span="6">
+          <!--<el-col :span="6">-->
-            <el-form-item prop="locInvCode" label="发货方:">
+          <!--  <el-form-item prop="locInvCode" label="发货方:">-->
-              <el-select v-model="formData.shipper" placeholder="请选择发货方" clearable
+          <!--    <el-select v-model="formData.shipper" placeholder="请选择发货方" clearable-->
-                         :disabled="formData.billNo"
+          <!--               :disabled="formData.billNo"-->
-                         style="width: 90%"
+          <!--               style="width: 90%"-->
-                         @change="changeShipper"
+          <!--               @change="changeShipper"-->
-
+
-              >
+          <!--    >-->
-                <el-option
+          <!--      <el-option-->
-                  v-for="item in invList"
+          <!--        v-for="item in invList"-->
-                  :key="item.name"
+          <!--        :key="item.name"-->
-                  :label="item.name"
+          <!--        :label="item.name"-->
-                  :value="item.code"
+          <!--        :value="item.code"-->
-                >
+          <!--      >-->
-                  <span style="float: left">{{ item.name }}</span>
+          <!--        <span style="float: left">{{ item.name }}</span>-->
-                </el-option>
+          <!--      </el-option>-->
-              </el-select>
+          <!--    </el-select>-->
-            </el-form-item>
+          <!--  </el-form-item>-->
-          </el-col>
+          <!--</el-col>-->
-          <el-col :span="6">
+          <!--<el-col :span="6">-->
-            <!--            :label="this.formDataVisible.unitTittle + ':'"-->
+          <!--  &lt;!&ndash;            :label="this.formDataVisible.unitTittle + ':'"&ndash;&gt;-->
-            <el-form-item class="query-form-item" label="收货方:">
+          <!--  <el-form-item class="query-form-item" label="收货方:">-->
-              <el-select v-model="formData.fromCorp"
+          <!--    <el-select v-model="formData.fromCorp"-->
-                         filterable
+          <!--               filterable-->
-                         :disabled="formData.billNo"
+          <!--               :disabled="formData.billNo"-->
-                         remote
+          <!--               remote-->
-                         reserve-keyword
+          <!--               reserve-keyword-->
-                         @change="changeCorp"
+          <!--               @change="changeCorp"-->
-                         placeholder="请选择收货方" clearable style="width: 90%"
+          <!--               placeholder="请选择收货方" clearable style="width: 90%"-->
-              >
+          <!--    >-->
-                <el-option
+          <!--      <el-option-->
-                  v-for="item in fromInvOptions"
+          <!--        v-for="item in fromInvOptions"-->
-                  :key="item.code"
+          <!--        :key="item.code"-->
-                  :label="item.name"
+          <!--        :label="item.name"-->
-                  :value="item.code"
+          <!--        :value="item.code"-->
-                >
+          <!--      >-->
-                  <span style="float: left">{{ item.name }}</span>
+          <!--        <span style="float: left">{{ item.name }}</span>-->
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+          <!--        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>-->
-                </el-option>
+          <!--      </el-option>-->
-              </el-select>
+          <!--    </el-select>-->
-            </el-form-item>
+          <!--  </el-form-item>-->
-          </el-col>
+          <!--</el-col>-->
 
         </el-row>
 
@@ -665,7 +665,7 @@ export default {
       _this.$nextTick(() => {
         _this.panelALive = true
       })
-      _this.getBizDetailList();
+      // _this.getBizDetailList();
       _this.vailOrderFinish()
     },
     refreshCodesPanelP() {