Merge tag 'Hotfix-zh-19' into develop

Finish Hotfix-zh-19

src/views/engin_deposit/components/deposit_list-detail.vue

@@ -80,7 +80,7 @@
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="16" class="item">
+            <el-col :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">安装时间</div>
               <div class="value" style="padding: 0">
                 <el-form-item prop="installDate">
@@ -95,21 +95,21 @@
                 </el-form-item>
               </div>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="8" class="item">
-              <div class="label">寄厂日期</div>
-              <div class="value" style="padding: 0">
-                <el-form-item prop="sendFactoryDate">
-                  <el-date-picker
-                    v-model="details.sendFactoryDate"
-                    type="datetime"
-                    placeholder="寄厂日期"
-                    default-time="00:00:00"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </div>
-            </el-col>
+<!--            <el-col :xs="24" :sm="24" :lg="8" class="item">-->
+<!--              <div class="label">寄厂日期</div>-->
+<!--              <div class="value" style="padding: 0">-->
+<!--                <el-form-item prop="sendFactoryDate">-->
+<!--                  <el-date-picker-->
+<!--                    v-model="details.sendFactoryDate"-->
+<!--                    type="datetime"-->
+<!--                    placeholder="寄厂日期"-->
+<!--                    default-time="00:00:00"-->
+<!--                    value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                  >-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--              </div>-->
+<!--            </el-col>-->
           </el-row>
         </el-form>
       </div>
@@ -492,13 +492,8 @@
 </template>
 
 <script>
-import {
-  geDetail,
-  geOrderInfo,
-  editInfo,
-  getListProject,
-} from "@/api/engin_deposit.js";
-import { getList } from "@/api/supply/adjust";
+import { editInfo, geDetail, geOrderInfo, getListProject } from '@/api/engin_deposit.js'
+import { getList } from '@/api/supply/adjust'
 
 export default {
   data() {

src/views/supply/policy/components/retail_detail.vue

@@ -264,6 +264,7 @@
     </div>
     <div class="page-footer">
       <div class="footer" :class="classObj">
+        <el-button type="success" @click="toCheckOrder">联查单据</el-button>
         <el-button
           :type="status ? 'info' : 'primary'"
           :disabled="detailData.examineStatus !== 'OK' || status"
@@ -499,6 +500,7 @@
         <el-button type="primary" @click="submitDeliverForm">确 定</el-button>
       </span>
     </el-dialog>
+    <CheckOrder :checkOrderId="checkOrderId" v-if="isShowCheckOrder" @backDetail="backDetail" />
   </div>
 </template>
 
@@ -506,10 +508,14 @@
 import { getDetail } from '@/api/supply/policy'
 import { adjustDeliver, finishData, getPositionList, getWarehouseList } from '@/api/supply/retail'
 import { mapState } from 'vuex'
+import CheckOrder from '@/components/Common/check-order'
 
 export default {
   name: 'RetailDetail',
   componentName: 'RetailDetail',
+  components: {
+    CheckOrder,
+  },
   filters: {
     statusFilter(val) {
       const statusList = [
@@ -545,7 +551,9 @@ export default {
       positionList: [],
 
       goodsList: [],
-      status: false
+      status: false,
+      checkOrderId: {},
+      isShowCheckOrder: false,
     }
   },
 
@@ -564,6 +572,10 @@ export default {
         this.detailData.examineStatus === 'OK' ||
         this.detailData.examineStatus === 'FAIL'
       )
+
+    },
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
     },
     progress() {
       if (this.detailData.totalQty == 0) return 0
@@ -673,6 +685,16 @@ export default {
     closeDeliverDialog() {
       this.isShowDeliverDialog = false
     },
+    // 联查单据
+    toCheckOrder() {
+      this.checkOrderId = this.detailData.id;
+      this.isShowCheckOrder = true;
+    },
+
+    backDetail() {
+      this.isShowCheckOrder = false;
+    },
+
     // 提交 直调发货
     submitDeliverForm() {
       this.$refs.deliverForm.validate((valid) => {