'bugfix'

.gitignore

@@ -1,3 +1,4 @@
+dist.zip
 .svn
 .DS_Store
 bower_components/

src/page/decorateManage/decorateList.vue

@@ -286,7 +286,7 @@
                 class="control"
                 href="javascript:void(0)"
                 @click="handleSp(row)"
-                v-if="row.examineState == '0' && row.decorationState != '0'"
+                v-if="row.examineState == '0' && row.decorationState != '0' && row.processApprovalaState != 1"
                 >审批</a
               >
               <a
@@ -2185,7 +2185,7 @@
               alt
               style="margin-bottom: 10px; width: 450px"
             />
-            <div class="xkzBox1" v-if="compType == 'YA'">
+            <div class="xkzBox1" v-if="compType == 'XINGHEWAN'">
               <Row>
                 <div
                   style="
@@ -2374,11 +2374,197 @@
                 </div>
               </Row>
             </div>
+            <div
+              class="xkzBox1"
+              v-if="compType == 'YUEAO'"
+              style="border: 1px solid #000"
+            >
+              <Row>
+                <Col
+                  span="24"
+                  style="
+                    padding: 10px;
+                    border-bottom: 1px solid #000;
+                    text-align: center;
+                    font-size: 22px;
+                    font-weight: 600;
+                  "
+                >
+                  装 修 施 工 许 可 证
+                </Col>
+                <div style="width: 100%; display: flex; position: relative">
+                  <Col
+                    span="12"
+                    style="
+                      line-height: 36px;
+                      border-bottom: 1px solid #000;
+                      padding-left: 10px;
+                      font-size: 14px;
+                    "
+                  >
+                    租赁单元编号： {{ item.roomName }}
+                    {{ item.ownerCompanyName }}
+                    <div
+                      style="
+                        position: absolute;
+                        border-right: 1px solid rgb(0, 0, 0);
+                        height: 100%;
+                        right: 0;
+                        top: 0;
+                      "
+                    ></div>
+                  </Col>
+                  <Col
+                    span="12"
+                    style="
+                      line-height: 36px;
+                      border-bottom: 1px solid #000;
+                      padding-left: 10px;
+                      font-size: 14px;
+                    "
+                  >
+                    许可证编号：{{ item.licenceNum }}
+                  </Col>
+                </div>
+
+                <Col
+                  span="24"
+                  style="
+                    padding: 10px;
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
+                    line-height: 20px;
+                  "
+                >
+                  <div style="font-size: 14px">
+                    <p style="font-size: 14px; margin-bottom: 8px">
+                      经审批，允许上述单元进行装修工程，装修具体内容如下：
+                    </p>
+                    <span :style="underline">{{
+                      item.constructionContent
+                    }}</span>
+                  </div>
+                  <div>
+                    <canvas :id="'qrCodeUrl' + index" class="ewmBox"></canvas>
+                  </div>
+                </Col>
+                <Col
+                  span="24"
+                  style="padding: 10px; font-size: 14px; margin-bottom: 30px"
+                >
+                  有效日期自
+                  <span :style="underline">{{
+                    item.decorationDate.split("~")[0].split("/")[0]
+                  }}</span>
+                  年
+                  <span :style="underline">{{
+                    item.decorationDate.split("~")[0].split("/")[1]
+                  }}</span
+                  >月
+                  <span :style="underline">{{
+                    item.decorationDate.split("~")[0].split("/")[2]
+                  }}</span
+                  >日开工至
+                  <span :style="underline">{{
+                    item.decorationDate.split("~")[1].split("/")[0]
+                  }}</span
+                  >年
+                  <span :style="underline">{{
+                    item.decorationDate.split("~")[1].split("/")[1]
+                  }}</span
+                  >月
+                  <span :style="underline">{{
+                    item.decorationDate.split("~")[1].split("/")[2]
+                  }}</span>
+                  日竣工，装修企业名称：
+                  <span :style="underline">{{
+                    item.decorationCompanyName
+                  }}</span>
+                  共有施工人员
+                  <span :style="underline">{{ item.constructorsNum }}</span>
+                  名
+                </Col>
+                <Col
+                  span="24"
+                  style="padding: 0 10px; font-size: 14px; margin-bottom: 8px"
+                >
+                  防火负责人：
+                  <span :style="underline" style="margin-right: 20px">{{
+                    item.firemanName
+                  }}</span>
+                  联系电话：
+                  <span :style="underline">{{ item.firemanTelephone }}</span>
+                </Col>
+                <Col
+                  span="24"
+                  style="padding: 0 10px; font-size: 14px; margin-bottom: 20px"
+                >
+                  现场负责人：
+                  <span :style="underline" style="margin-right: 20px">{{
+                    item.decorationLeader
+                  }}</span>
+                  联系电话：
+                  <span :style="underline">{{ item.leaderTelephone }}</span>
+                </Col>
+                <Col
+                  span="24"
+                  style="
+                    padding: 0 10px;
+                    text-align: right;
+                    font-size: 14px;
+                    margin-bottom: 18px;
+                  "
+                >
+                  横琴粤澳中医药科技产业园物业管理服务有限公司
+                </Col>
+                <Col
+                  span="24"
+                  style="
+                    padding: 0 10px;
+                    text-align: right;
+                    font-size: 14px;
+                    margin-bottom: 18px;
+                  "
+                >
+                  工程设备部负责人：&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;
+                </Col>
+                <Col
+                  span="24"
+                  style="
+                    padding: 0 10px;
+                    text-align: right;
+                    font-size: 14px;
+                    margin-bottom: 18px;
+                  "
+                >
+                  &emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;
+                </Col>
+                <Col
+                  span="24"
+                  style="padding: 0 10px; font-size: 14px; margin-bottom: 8px"
+                >
+                  注：1、严格遵守《装修图纸意见审批单》、《装饰装修管理协议》及粤澳中医药科技产业园装修相关管理制度中的有关规定。
+                </Col>
+                <Col
+                  span="24"
+                  style="padding: 0 10px; font-size: 14px; margin-bottom: 8px"
+                >
+                  &emsp;&emsp;2、如需延期施工，须到我公司客户服务部申请办理延期手续。
+                </Col>
+                <Col
+                  span="24"
+                  style="padding: 0 10px; font-size: 14px; margin-bottom: 8px"
+                >
+                  &emsp;&emsp;3、本许可证须张贴在施工现场明显位置。
+                </Col>
+              </Row>
+            </div>
             <div
               class="xkzBox"
               style="page-break-after: always"
               v-for="(item, index) in xkzData"
-              v-else-if="compType == 'CHJ'"
+              v-else-if="compType == 'CAOHEJING'"
             >
               <Row :gutter="0" style="height: 60px">
                 <Col span="6" class="progectId" style="text-align: left">
@@ -3106,7 +3292,7 @@ export default {
   },
   data() {
     const phonePass = (rule, value, callback) => {
-      let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+      let myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
       if (value === "") {
         callback(new Error("请填写联系电话"));
       } else if (!myreg.test(value)) {
@@ -3205,7 +3391,7 @@ export default {
         "font-size: 20px;line-height: 22px;display: inline-block;padding: 0px 5px;border-bottom: 1px solid #000;",
       paymentTypeList: [],
       logo: null,
-      compType: "YA",
+      compType: "YUEAO",
       //  自适应尺寸↓
       resizeHeight: 100,
       resizeWidth: 100,
@@ -4311,8 +4497,11 @@ export default {
                       : "",
                 },
               },
-              params.row.examineState == 0
+              params.row.examineState == 0 && !params.row.processApprovalaState
                 ? "待审核"
+                : "" + params.row.examineState == 0 &&
+                  params.row.processApprovalaState == 1
+                ? "流程待审批"
                 : "" + params.row.examineState == 2
                 ? "驳回"
                 : "" + params.row.examineState == 1
@@ -5756,16 +5945,16 @@ export default {
         });
         return;
       }
-      if (
-        this.detailForm.leaderTelephone.slice(0, 3) == "166" ||
-        this.detailForm.fhfzrdh.slice(0, 3) == "166"
-      ) {
-        this.$Notice.warning({
-          title: "提示",
-          desc: "联系电话不可为166开头",
-        });
-        return;
-      }
+      // if (
+      //   this.detailForm.leaderTelephone.slice(0, 3) == "166" ||
+      //   this.detailForm.fhfzrdh.slice(0, 3) == "166"
+      // ) {
+      //   this.$Notice.warning({
+      //     title: "提示",
+      //     desc: "联系电话不可为166开头",
+      //   });
+      //   return;
+      // }
       this.isSubmit = true;
       this.$refs.detailForm.validate((valid) => {
         if (valid) {