Merge branch 'sit'

src/views/sellOut/sellReturn/components/comExamForm.vue

@@ -210,8 +210,10 @@ export default {
     },
     // 选择仓库
     change_return_wsm(e) {
+      console.log(e);
       const { code } = e;
       this.ruleForm.return_wsm = code ? [code] : [];
+      console.log(this.ruleForm.return_wsm);
       this.$refs.ruleForm.validateField("return_wsm");
     },
     // 选择供应商
@@ -234,7 +236,7 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          if (model.is_th === "1") {
+          if (model.is_th === "0") {
             model.remark = "";
           } else {
             model.return_wsm = [];

src/views/sellOut/sellReturn/detail.vue

@@ -64,7 +64,7 @@
                   </el-popover>
                 </template>
                 <template slot="is_active">
-                  <span v-if="sitem.order_type === '1'"
+                  <span v-if="sitem && sitem.order_type === '1'"
                     ><span
                       >{{
                         sitem.is_activity === "1" ? "参与活动" : "不参与活动"
@@ -137,7 +137,7 @@
               <show-goods-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
-                :type="sitem.order_type"
+                :type="sitem && sitem.order_type ? sitem.order_type : ''"
                 :skucode="sitem.skuCode"
                 :spucode="sitem.good_code"
                 :iscgd="false"
@@ -147,11 +147,12 @@
               title="业务审核"
               name="3"
               v-if="
+                newTime !== '' &&
+                sitem &&
                 !(
                   (sitem.order_type === '1' || sitem.order_type === '2') &&
                   is_stock === '1'
                 ) &&
-                sitem &&
                 powers.some((item) => item == '041') &&
                 status === '1'
               "
@@ -173,7 +174,8 @@
                 sitem &&
                 (status === '4' || status === '3' || status === '2') &&
                 !(
-                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  ((sitem && sitem.order_type === '1') ||
+                    sitem.order_type === '2') &&
                   is_stock === '1'
                 )
               "
@@ -200,7 +202,8 @@
                 powers.some((item) => item == '036') &&
                 status === '3' &&
                 !(
-                  (sitem.order_type === '1' || sitem.order_type === '2') &&
+                  ((sitem && sitem.order_type === '1') ||
+                    sitem.order_type === '2') &&
                   is_stock === '1'
                 )
               "