Merge branch 'master' into dev/ver/1.0.0

src/views/consignmentManagement/consignmentContract.vue

@@ -19,16 +19,21 @@
       <div class="data-box">
         <el-table :data="list" border max-height="600" @selection-change="handleSelectionChange">
           <el-table-column type="index" label="序号" width="50" align="center" fixed></el-table-column>
-          <el-table-column prop="contract_no" label="合同编号" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="contract_file" label="合同文件" width="160" :show-overflow-tooltip="true" align="center">
+          <el-table-column prop="contract_no" label="合同编号" min-width="120" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="contract_file" label="合同模板" width="110" :show-overflow-tooltip="true" align="center">
             <template slot-scope="scope">
               <a v-if="scope.row.contract_file" :href="scope.row.contract_file" target="_blank" style="color: #409EFF">下载</a>
             </template>
           </el-table-column>
+          <el-table-column prop="signed_contract_file" label="签署合同文件" width="110" :show-overflow-tooltip="true" align="center">
+            <template slot-scope="scope">
+              <a v-if="scope.row.signed_contract_file" :href="scope.row.signed_contract_file" target="_blank" style="color: #409EFF">下载</a>
+            </template>
+          </el-table-column>
           <el-table-column prop="status_name" label="状态" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="commission_rate" label="抽佣比例(%)" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="end_time" label="合同有效期" width="290" :show-overflow-tooltip="true" align="center"></el-table-column>
-          <el-table-column prop="check_date" label="对账日期" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
+          <el-table-column prop="check_date" label="对账日期" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="update_time" label="更新时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="create_name" label="创建人" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>
           <el-table-column prop="update_time" label="创建时间" width="160" :show-overflow-tooltip="true" align="center"></el-table-column>

src/views/consignmentManagement/consignmentRecall.vue

@@ -24,7 +24,7 @@
       <!--操作区-->
       <div class="operation-area row verCenter bothSide">
         <div class="operation-button row verCenter">
-          <el-button type="primary" @click="$router.push('/createConsignmentRecallOrder')">生成寄售找回单</el-button>
+          <el-button type="primary" @click="$router.push('/createConsignmentRecallOrder')">生成寄售召回单</el-button>
           <!--
           <el-button type="primary" @click="popupEvent(1)">提交审核</el-button>
           <el-button type="primary" @click="popupEvent(2)">作废</el-button>