修改订单添加收货人手机

src/api/his/storeOrder.js

@@ -15,6 +15,13 @@ export function importTemplate() {
     method: 'get'
   })
 }
+// 下载导入模板
+export function importUpdateOrderTemplate() {
+  return request({
+    url: '/his/storeOrder/importUpdateOrderTemplate',
+    method: 'get'
+  })
+}
 // 查询订单详细
 export function getOrder(orderId) {
   return request({
@@ -149,6 +156,15 @@ export function updateOrder(data) {
     data: data
   })
 }
+// 修改订单
+export function updateStoreOrder(data) {
+  return request({
+    url: '/his/storeOrder/updateStoreOrder',
+    method: 'put',
+    data: data
+  })
+}
+
 export function updateDelivery(data) {
   return request({
     url: '/his/storeOrder/updateDelivery',

src/views/components/his/storeOrderDetails.vue

@@ -366,7 +366,10 @@
                    </el-form-item>
                    <el-form-item label="详情地址" prop="userAddress"  >
                     <el-input v-model="editForm.userAddress" placeholder="请输入" />
-                  </el-form-item>
+                   </el-form-item>
+                   <el-form-item label="收货人电话" prop="userPhone"  >
+                    <el-input v-model="editForm.userPhone" placeholder="请输入" />
+                   </el-form-item>
                   <el-form-item label="备注" prop="remark"  >
                     <el-input v-model="editForm.remark" placeholder="请输入备注" />
                   </el-form-item>
@@ -418,7 +421,7 @@
 </template>
 
 <script>
-import {getMsgFollow,sendMsg,msgList,updateMoney,getGoods,getEroOrder,editTuiMoney,updateDelivery,createErpOrder,updateExpress,updateErp, afterSales,sendgoods,logList,listOrder,getExpress,syncExpress, listOrderitem,getOrder, delOrder, addOrder, updateOrder, exportOrder,payment,tuiOrder ,getPrescribe,getOrderUserPhone,returnCost} from "@/api/his/storeOrder";
+import {getMsgFollow,sendMsg,msgList,updateMoney,getGoods,getEroOrder,editTuiMoney,updateDelivery,createErpOrder,updateExpress,updateErp, afterSales,sendgoods,logList,listOrder,getExpress,syncExpress, listOrderitem,getOrder, delOrder, addOrder, updateStoreOrder, exportOrder,payment,tuiOrder ,getPrescribe,getOrderUserPhone,returnCost} from "@/api/his/storeOrder";
 import inquiryOrderDetails from '../his/inquiryOrderDetails.vue';
 import packageOrderDetails from '../his/packageOrderDetails2.vue';
 import prescribeDetails from '../his/prescribeDetails.vue';
@@ -515,6 +518,7 @@ import { getTcmScheduleList } from "@/api/company/schedule";
           userAddress:null,
           deliveryStatus:null,
           deliveryType:null,
+          userPhone:null,
           remark:"",
         },
         editDyRules:{
@@ -706,7 +710,7 @@ import { getTcmScheduleList } from "@/api/company/schedule";
     submitEditForm(){
         this.$refs["editForm"].validate(valid => {
         if (valid) {
-          updateOrder(this.editForm).then(response => {
+          updateStoreOrder(this.editForm).then(response => {
             if (response.code === 200) {
               this.msgSuccess("操作成功");
                this.edit.open = false;
@@ -725,6 +729,7 @@ import { getTcmScheduleList } from "@/api/company/schedule";
         this.editForm.orderId=this.item.orderId;
         this.editForm.remark=this.item.remark;
         this.editForm.userAddress = this.item.userAddress.toString();
+        this.editForm.userPhone = this.item.userPhone.toString();
         this.editForm.status = this.item.status.toString();
         this.editForm.deliveryType = this.item.deliveryType.toString();
         this.editForm.deliveryStatus = this.item.deliveryStatus.toString();

src/views/his/storeOrder/order1.vue

@@ -364,6 +364,16 @@
             v-hasPermi="['his:storeOrder:exportDeliver']"
           >导入发货</el-button>
         </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="info"
+            plain
+            icon="el-icon-upload2"
+            size="mini"
+            @click="handleImportStatus"
+            v-hasPermi="['his:storeOrder:editImport']"
+          >导入订单状态</el-button>
+        </el-col>
         <el-col :span="1.5">
           <el-button
             type="info"
@@ -589,6 +599,34 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :title="uploadStatus.title" :visible.sync="uploadStatus.open" width="400px" append-to-body>
+        <el-upload
+          ref="uploadStatus"
+          :limit="1"
+          accept=".xlsx, .xls"
+          :headers="uploadStatus.headers"
+          :action="uploadStatus.url + '?updateSupport=' + upload.updateSupport"
+          :disabled="uploadStatus.isUploading"
+          :on-progress="handleFileUploadProgressOrder"
+          :on-success="handleFileSuccessOrder"
+          :auto-upload="false"
+          drag
+        >
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-center" slot="tip">
+            <div class="el-upload__tip" slot="tip">
+            </div>
+            <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importUpdateOrderTemplate">下载模板</el-link>
+          </div>
+        </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitOrderStatusFileForm">确 定</el-button>
+        <el-button @click="uploadStatus.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
     
     <!-- 设置推送手机对话框 -->
     <el-dialog :title="erpPhone.title" :visible.sync="erpPhone.open" width="600px" append-to-body>
@@ -721,7 +759,7 @@
 
 <script>
 import { listOrder, getOrder, delOrder, addOrder,importExpressTemplate, updateOrder, exportOrder,importTemplate,exportOrder2,queryErpPhone,
-  saveErpPhone,editErpPhone,batchCreateErpOrder,getErpAccount,batchSetErpOrder } from "@/api/his/storeOrder";
+  saveErpPhone,editErpPhone,batchCreateErpOrder,getErpAccount,batchSetErpOrder,importUpdateOrderTemplate } from "@/api/his/storeOrder";
 import storeOrderDetails from '../../components/his/storeOrderDetails.vue';
 import { getToken } from "@/utils/auth";
 import {listStore} from "@/api/his/storeProduct";
@@ -831,6 +869,20 @@ export default {
         // 上传的地址
         url: process.env.VUE_APP_BASE_API + "/his/storeOrder/importData"
       },
+      uploadStatus: {
+        // 是否显示弹出层
+        open: false,
+        // 弹出层标题
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/his/storeOrder/importOrderStatusData"
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -1657,6 +1709,10 @@ export default {
         handleFileUploadProgressExpress(event, file, fileList) {
           this.upload.isUploading = true;
         },
+        // 文件上传中处理
+        handleFileUploadProgressOrder(event, file, fileList) {
+          this.uploadStatus.isUploading = true;
+        },
         // 文件上传成功处理
         handleFileSuccessExpress(response, file, fileList) {
           this.importExpress.open = false;
@@ -1665,14 +1721,26 @@ export default {
           this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
           this.getList();
         },
+         // 文件上传成功处理
+         handleFileSuccessOrder(response, file, fileList) {
+          this.uploadStatus.open = false;
+          this.uploadStatus.isUploading = false;
+          this.$refs.uploadStatus.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+        },
+        
         // 提交上传文件
         submitFileFormExpress() {
           this.$refs.importExpress.submit();
         },
 
-
-    /** 导入按钮操作 */
-    handleImport() {
+      handleImportStatus() {
+        this.uploadStatus.title = "导入";
+        this.uploadStatus.open = true;
+       },
+      /** 导入按钮操作 */
+      handleImport() {
         this.upload.title = "导入";
         this.upload.open = true;
        },
@@ -1683,6 +1751,11 @@ export default {
           this.download(response.msg);
         });
       },
+      importUpdateOrderTemplate(){
+        importUpdateOrderTemplate().then(response => {
+          this.download(response.msg);
+        });
+      },
       // 文件上传中处理
       handleFileUploadProgress(event, file, fileList) {
         this.upload.isUploading = true;
@@ -1699,6 +1772,9 @@ export default {
       submitFileForm() {
         this.$refs.upload.submit();
       },
+      submitOrderStatusFileForm(){
+        this.$refs.uploadStatus.submit();
+      },
     handledetails(row){
         this.show.open=true;
         setTimeout(() => {

src/views/system/role/index.vue

@@ -189,6 +189,18 @@
             >{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否可以查看手机全号" >
+          <span slot="label">
+            <el-tooltip content="是否可以查看手机全号" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+            号码权限
+          </span>
+          <el-radio-group v-model="form.isCheckPhone">
+            <el-radio :label=0>否</el-radio>
+            <el-radio :label=1>是</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
@@ -454,6 +466,7 @@ export default {
         roleKey: undefined,
         roleSort: 0,
         status: "0",
+        isCheckPhone:0,
         menuIds: [],
         deptIds: [],
         menuCheckStrictly: true,