Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!158

src/views/purchase/deliveryAddress/index.vue

@@ -177,20 +177,28 @@
           <el-table-column show-overflow-tooltip type="selection" width="55" />
           <el-table-column show-overflow-tooltip label="仓库属性" align="center" prop="warehouseProperty"/>
           <el-table-column show-overflow-tooltip label="仓库档案名称" align="center" width="200" prop="warehouseName"/>
-          <el-table-column show-overflow-tooltip label="收货仓库编码" align="center" prop="code" />
+          <el-table-column show-overflow-tooltip label="收货仓库编码" align="center" prop="code" width="150"/>
           <el-table-column show-overflow-tooltip label="收货仓库名称" align="center" width="150" prop="name"/>
           <el-table-column show-overflow-tooltip label="详细地址" align="center" width="150" prop="address"/>
           <el-table-column show-overflow-tooltip label="物料分类" align="center" width="150" prop="materialClassifyName" />
           <el-table-column show-overflow-tooltip label="联系人" align="center" width="150" prop="contactsName" />
-          <el-table-column show-overflow-tooltip label="联系人电话" align="center" prop="contactsPhone" />
+          <el-table-column show-overflow-tooltip label="联系人电话" align="center" prop="contactsPhone" width="150" />
           <el-table-column show-overflow-tooltip label="NC档案ID" align="center" width="150" prop="createTime" />
           <el-table-column show-overflow-tooltip label="备注" align="center" width="120" prop="remark" />
           <el-table-column show-overflow-tooltip label="创建人" align="center" width="150" prop="createByName" />
           <el-table-column show-overflow-tooltip label="创建时间" align="center" width="150" prop="createTime" />
           <el-table-column show-overflow-tooltip label="修改人" align="center" width="150" prop="updateByName" />
           <el-table-column show-overflow-tooltip label="修改时间" align="center" width="150" prop="updateTime" />
-          <el-table-column show-overflow-tooltip label="同步状态" align="center" width="150" prop="sendStatus" />
-          <el-table-column show-overflow-tooltip label="启用" align="center" width="150" prop="status" />
+          <el-table-column show-overflow-tooltip label="同步状态" align="center" width="150" prop="sendStatus">
+            <template slot-scope="scope">
+              {{ scope.row.sendStatus == 'Y' ? '已同步' : '未同步'}}
+            </template>
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="启用" align="center" width="150" prop="status">
+            <template slot-scope="scope">
+              {{ scope.row.status == 'Y' ? '启用' : '停用' }}
+            </template>
+          </el-table-column>
           <el-table-column
           fixed="right"
           label="操作"