Merge branch '1.1.19'

# Conflicts:
#	src/views/system/order/index.vue

src/views/entry/fillMainInf.vue

@@ -17,7 +17,13 @@
           <el-form-item>
             <p class="main-form-title">企业资质信息</p>
           </el-form-item>
-
+          <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
+            <el-radio-group v-model="mainForm.organization_type" size="mini">
+              <el-radio :label="2">小规模</el-radio>
+              <el-radio :label="1">一般纳税人</el-radio>
+            </el-radio-group>
+            <span class="tips-text"><i class="el-icon-warning h-warning"></i>请正确选择企业类型，会影响提现时所需发票的性质。小规模需提供普票，一般纳税人需提供专票</span>
+          </el-form-item>
           <el-form-item label="营业执照：" prop="license" >
             <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
               <div style="padding-right:6px;">
@@ -272,6 +278,7 @@
         submitTime: [],
         // 主体信息
         mainForm: {
+          organization_type:2,
           license: '',
           organization_name: '',
           license_number: '',
@@ -289,6 +296,7 @@
         // 主体信息校验
         hasLicense: false,
         mainRules: {
+          organization_type:[{required: true, message: '企业类型', trigger: 'blur'}],
           license: [{required: true, message: '请上传营业执照电子版',validator: licenseValidator}],
           organization_name: [{required: true, message: '企业名称不能为空', trigger: 'blur'}],
           license_number: [{required: true, message: '统一社会代码不能为空', trigger: 'blur'}],

src/views/system/order/index.vue

@@ -206,7 +206,13 @@
                 </template>
               </el-table-column> -->
                 <el-table-column prop="refund_status" label="售后状态" width="180" align="center"
-                  :formatter="refundStatusFormatter"></el-table-column>
+                  :formatter="refundStatusFormatter">
+                  <template slot-scope="scope">
+                    {{refundStatusFormatter(scope.row.refund_status)}}<br/>
+                  {{timeFormatter(scope.row.after_sale_accomplish_time)}}
+                </template>
+                </el-table-column>
+                
                 <el-table-column prop="remark" label="订单备注" width="120" align="center">
                   <template slot-scope="scope">
                     {{item.order.remark?item.order.remark:'暂无备注内容'}}
@@ -220,7 +226,7 @@
                 <el-table-column label="操作" width="120" align="center" fixed="right">
                   <template slot-scope="scope">
                     <el-button type="text" @click="handleInfo(scope.row)">详情</el-button>
-                    <el-button :disabled="Number(scope.row.goods_status)!==0" type="text"
+                    <el-button :disabled="Number(scope.row.goods_status)!==0||(Number(scope.row.status)!=0&&Number(scope.row.status)!=-1)" type="text"
                       @click="goShipping(scope.row.id,scope.row.goods_order_sn)">去发货</el-button>
                   </template>
                 </el-table-column>
@@ -555,7 +561,7 @@
       },
       /** 表格合并 列单元格 */
       arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex > 3 && columnIndex != 8 && columnIndex != 9) { // 用于设置要合并开始的列号
+        if (columnIndex > 3 && columnIndex != 6 && columnIndex != 8 && columnIndex != 9) { // 用于设置要合并开始的列号
           if (rowIndex === 0) { // 用于设置合并开始的行号
             return {
               rowspan: 100,　　　　　// 合并的行数
@@ -637,7 +643,7 @@
         return res
       },
       /** 售后状态 */
-      refundStatusFormatter(row, column, cellValue, index) {
+      refundStatusFormatter(cellValue) {
         let statusText = '--'
         if (cellValue == 1) {
           statusText = '申请仅退款'

src/views/system/shop/index.vue

@@ -19,7 +19,10 @@
           </div>
           <el-form ref="mainForm" :model="mainForm" label-width="180px" class="main-form-con"
                      size="small">
-
+              <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
+                <span v-if="mainForm.organization_type==2">小规模</span>
+                <span v-if="mainForm.organization_type==1">一般纳税人</span>
+              </el-form-item>
               <el-form-item label="营业执照：" prop="license">
                 <div style="width:100%;height: 100%;display: flex;flex-direction: row;justify-content: normal;">
                   <div style="padding-right:6px;">
@@ -252,7 +255,13 @@
     <el-dialog title="编辑店铺信息" :visible.sync="isOpen" width="65%" class="shopinf-edit"
                center :destroy-on-close="true" :close-on-click-modal="false" :before-close="handleCancel">
       <el-form v-if="isOpen" ref="editForm" class="editForm" :model="editForm" :rules="editRules" label-width="180px" size="small">
-
+        <!-- <el-form-item label="企业类型：" prop="organization_type" inline-message="true">
+          <el-radio-group v-model="editForm.organization_type" size="mini">
+            <el-radio :label="2">小规模</el-radio>
+            <el-radio :label="1">一般纳税人</el-radio>
+          </el-radio-group>
+          <span class="tips-text"><i class="el-icon-warning h-warning"></i>请正确选择企业类型，会影响提现时所需发票的性质。小规模需提供普票，一般纳税人需提供专票</span>
+        </el-form-item> -->
         <el-form-item label="电商平台经验：" prop="is_business_experience">
           <el-radio-group v-model="editForm.is_business_experience">
             <el-radio :label="1">有</el-radio>
@@ -402,6 +411,7 @@
         reviewResult: '加载中。。',
         isMainItem: true,// 主体/企业信息 是否可以修改，目前暂时不能
         mainForm: {
+          organization_type:1,
           license: '',
           organization_name: '',
           license_number: '',
@@ -454,6 +464,7 @@
         // 编辑
         isOpen: false,
         editForm: {
+          // organization_type:2,
           is_business_experience: '',
           store_name: '',
           scope: [],