Merge branch 'gcl' of http://gitlab.yiboshi.com/ynby/folacin-front into gcl

# Conflicts:
#	src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue

src/views/indexComponent/distributionWarehousing/components/addDistributionWarehousing.vue

@@ -58,7 +58,7 @@
                                        :wrapperCol="{span: 12}">
                         <a-textarea
                                 :rows="5"
-                                    v-toRemarkNum
+                                :maxLength="200"
                                 v-model="formData.remarks"
                                 placeholder="请输入备注(最多可输入200字)"></a-textarea>
                     </a-form-model-item>
@@ -128,15 +128,17 @@
             width: 120px;
         }
     }
+
     .ready_stock {
         border-radius: 2px;
         width: 62px;
         text-align: center;
         padding: 2px 8px;
-        background:#FFF7E6;
+        background: #FFF7E6;
         border: 1px solid #FFD591;
         color: #FA8C16
     }
+
     .in_stock {
         border-radius: 2px;
         width: 62px;

src/views/indexComponent/folviteDistribution/components/folviteDistributionDetail.vue

@@ -90,7 +90,7 @@
                          </div>
                         <div v-if="routerParams.source == 2">
                             <img style="width: 100%;height: 160px" :src="detailInfo.applySignUrl">
-                        </div>-->
+                        </div>
                         <!--                <a-descriptions bordered layout="vertical" class="no_border">-->
                         <!--                    <a-descriptions-item label="上传照片">-->
                         <!--                        {{detailInfo.batchNumber || '&#45;&#45;'}}-->
@@ -134,6 +134,14 @@
                 </div>
             </a-card>
         </a-spin>
+        <a-modal title="查看知情同意书" :visible="showVisible" @cancel="showVisible = false" @ok="showVisible=false"
+                 loading="true"
+                 :maskClosable="false"
+                 width="800px">
+            <div>
+                <img style="width: 100%" :src="detailInfo.consentUrl" height="100%"/>
+            </div>
+        </a-modal>
     </div>
 </template>
 <script>
@@ -142,11 +150,11 @@
     import router from "../../../../router";
 
     const columns = [
-        {
             title: '供应商',
             dataIndex: 'supplierName',
             ellipsis: true
         },
+        {
         {
             title: '品牌',
             dataIndex: 'brandName',

src/views/utils/common.js

@@ -134,9 +134,9 @@ export const checkPhone = (rule, value, callback) => {
     if (value == '' || value == undefined) {
         callback()
     }
-    var ckPhone = /^1(?:3[0-9]|4[5-9]|5[0-9]|6[12456]|7[0-8]|8[0-9]|9[0-9])[0-9]{8}$/;
-    let cktel = /^[0][1-9]{2,3}-[0-9]{5,10}$/;
-    if (ckPhone.test(value) || cktel.test(value)) {
+    let ckPhone = /^1(?:3[0-9]|4[5-9]|5[0-9]|6[12456]|7[0-8]|8[0-9]|9[0-9])[0-9]{8}$/;
+    let tell = /^0\d{2,3}-?\d{7,8}$/;
+    if (ckPhone.test(value) || tell.test(value)) {
         callback()
     } else {
         callback(new Error('请输入正确的手机号或座机'));

src/views/utils/directives/remarkNum.js

@@ -14,7 +14,6 @@ Vue.directive('toRemarkNum', {
             }
         })
         function checkValue(el, defu) {
-            debugger
             let len = el.value.length
             if (el.value && len > defu) {
                 el.value = el.value.substring(0, defu);