修改

src/api/system/userlist.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getListByUser(query) {
     return request({
-        url: '/system/user/getListByUser',
+        url: '/system/station/list',
         method: 'GET',
         params: query
     })

src/views/system/StationDepartment/indexjs.js

@@ -117,6 +117,7 @@ export default {
     },
     methods: {
         ParamsStation(item) {
+            this.info();
             this.innerVisible = true
             this.homenumber = item
             this.stationid = this.queryParams.nurseStationId;

src/views/system/goodsInfo/index.vue

@@ -67,7 +67,7 @@
         >
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -96,7 +96,7 @@
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-    </el-row>
+    </el-row> -->
     <el-table
       v-loading="loading"
       :data="goodsInfoList"
@@ -129,13 +129,19 @@
       </el-table-column>
       <el-table-column label="上架状态" align="center" prop="whetherShelf">
         <template slot-scope="scope">
-          <el-switch
+          <el-button type="primary" v-if="scope.row.whetherShelf == '1'"
+            >已上架</el-button
+          >
+          <el-button type="danger" v-if="scope.row.whetherShelf == '0'"
+            >未上架</el-button
+          >
+          <!-- <el-switch
             v-model="scope.row.whetherShelf"
             active-color="#13ce66"
             inactive-color="#ff4949"
             @change="upwhetherShelf(scope.row)"
           >
-          </el-switch>
+          </el-switch> -->
         </template>
       </el-table-column>
       <el-table-column
@@ -152,7 +158,7 @@
 
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -175,7 +181,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <pagination
       v-show="total > 0"
@@ -198,14 +204,6 @@
         label-width="120px"
         :inline="true"
       >
-        <el-form-item label="商品名称" prop="goodsName">
-          <el-input
-            v-model="form.goodsName"
-            placeholder="请输入商品名称"
-            maxlength="40"
-            style="width: 210px"
-          />
-        </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
           <el-input
             v-model="form.nurseStationName"
@@ -215,7 +213,14 @@
             disabled
           />
         </el-form-item>
-
+        <el-form-item label="商品名称" prop="goodsName">
+          <el-input
+            v-model="form.goodsName"
+            placeholder="请输入商品名称"
+            maxlength="40"
+            style="width: 210px"
+          />
+        </el-form-item>
         <el-form-item label="商品分类名称" prop="goodsCategoryId">
           <el-select
             style="width: 210px"
@@ -281,6 +286,7 @@
               <el-input
                 v-model="scope.row.goodsPrice"
                 type="number"
+                min="0"
                 oninput=" if(value.length>7){value=value.slice(0,7)}"
               ></el-input>
             </template>
@@ -290,6 +296,7 @@
               <el-input
                 v-model="scope.row.goodsStock"
                 type="number"
+                min="0"
                 oninput="if(value.length>9){value=value.slice(0,9)}"
               ></el-input>
             </template>

src/views/system/goodsOrder/index.vue

@@ -47,13 +47,6 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
-        <el-button
-          type="success"
-          icon="el-icon-refresh-right"
-          size="mini"
-          @click="resetQuery"
-          >刷新商品订单</el-button
-        >
       </el-form-item>
     </el-form>
 
@@ -171,15 +164,6 @@
             v-hasPermi="['system:goodsOrder:editExpressNo']"
             >录入物流单号</el-button
           >
-          <el-button
-            v-if="scope.row.orderStatus != 'WAIT_RECEIVED_GOODS'"
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            disabled
-            v-hasPermi="['system:goodsOrder:editExpressNo']"
-            >不可录入物流单号</el-button
-          >
         </template>
       </el-table-column>
       <el-table-column

src/views/system/order/index.vue

@@ -54,13 +54,6 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
           >重置</el-button
         >
-        <el-button
-          type="success"
-          icon="el-icon-refresh-right"
-          size="mini"
-          @click="resetQuery"
-          >刷新预约订单</el-button
-        >
       </el-form-item>
     </el-form>
     <el-table
@@ -139,15 +132,6 @@
             v-if="scope.row.orderStatus == 'WAIT_DISPATCH'"
             >派单</el-button
           >
-          <el-button
-            size="mini"
-            type="text"
-            disabled
-            icon="el-icon-s-promotion"
-            @click="dispatch(scope.row)"
-            v-else
-            >派单</el-button
-          >
           <el-button
             size="mini"
             type="text"
@@ -157,15 +141,6 @@
             v-hasPermi="['system:appointmentOrder:confirmCancel']"
             >取消预约</el-button
           >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-error"
-            v-else
-            disabled
-            v-hasPermi="['system:appointmentOrder:confirmCancel']"
-            >取消预约</el-button
-          >
           <!-- <el-button
             size="mini"
             type="text"
@@ -189,85 +164,86 @@
       title="查看预约订单信息"
       :visible.sync="innerVisible4"
       append-to-body
-      width="1100px"
+      width="1280px"
     >
       <el-form
         :inline="true"
         ref="form"
         :model="query"
         :rules="rules"
-        label-width="120px"
+        label-width="130px"
-        class="orderInfo"
       >
         <el-form-item label="订单编号" prop="orderNo">
-          <el-input
+          <el-input v-model="query.orderNo" disabled style="width: 250px" />
-            v-model="query.orderNo"
-            :disabled="true"
-            style="width: 190px"
-          />
         </el-form-item>
         <el-form-item label="订单状态" prop="orderStatus">
           <el-input
             :value="switchOrderStatus(query.orderStatus)"
+            style="width: 250px"
             disabled
-            style="width: 180px"
           >
           </el-input>
         </el-form-item>
         <el-form-item label="订单总金额" prop="totalPrice">
-          <el-input
+          <el-input v-model="query.totalPrice" disabled style="width: 250px" />
-            v-model="query.totalPrice"
-            clearable
-            :disabled="true"
-            style="width: 240px"
-          />
         </el-form-item>
         <el-form-item label="订单数量" prop="orderCount">
-          <el-input
+          <el-input v-model="query.orderCount" disabled style="width: 250px" />
-            v-model="query.orderCount"
-            clearable
-            :disabled="true"
-            style="width: 190px"
-          />
         </el-form-item>
         <el-form-item label="护理项目名称" prop="nurseItemName">
           <el-input
             v-model="query.nurseItemName"
-            clearable
+            disabled
-            :disabled="true"
+            style="width: 250px"
-            style="width: 180px"
           />
         </el-form-item>
         <el-form-item label="服务时间" prop="time">
-          <el-input
+          <el-input v-model="query.time" disabled style="width: 250px" />
-            v-model="query.time"
-            clearable
-            :disabled="true"
-            style="width: 240px"
-          />
         </el-form-item>
         <el-form-item label="护理项目时长" prop="itemServeDurationUnit">
           <el-input
             v-model="query.itemServeDurationUnit"
-            clearable
+            disabled
-            :disabled="true"
+            style="width: 250px"
-            style="width: 190px"
           />
         </el-form-item>
         <el-form-item label="护理站名称" prop="nurseStationName">
           <el-input
             v-model="query.nurseStationName"
-            clearable
+            disabled
-            :disabled="true"
+            style="width: 250px"
-            style="width: 180px"
           />
         </el-form-item>
         <el-form-item label="服务地址" prop="serviceAddress">
           <el-input
             v-model="query.serviceAddress"
-            clearable
+            disabled
-            :disabled="true"
+            style="width: 250px"
-            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item
+          label="服务到岗照片"
+          prop="onDutyPictureUrl"
+          v-if="query.orderStatus == 'COMPLETE'"
+        >
+          <img class="img" :src="baseurl + query.onDutyPictureUrl" alt="" />
+        </el-form-item>
+        <el-form-item
+          label="服务结束照片"
+          prop="serviceEndPictureUrl"
+          v-if="query.orderStatus == 'COMPLETE'"
+        >
+          <img class="img" :src="baseurl + query.serviceEndPictureUrl" alt="" />
+        </el-form-item>
+        <el-form-item
+          label="用户确认签名"
+          prop="userSignaturePictureUrl"
+          v-if="query.orderStatus == 'COMPLETE'"
+        >
+          <img
+            class="img"
+            :src="baseurl + query.userSignaturePictureUrl"
+            alt=""
           />
         </el-form-item>
         <el-table
@@ -278,21 +254,18 @@
           <el-table-column
             prop="orderConsumableName"
             label="耗材包名称"
-            width="200"
             align="center"
           >
           </el-table-column>
           <el-table-column
             prop="orderConsumableCount"
             label="耗材包数量"
-            width="200"
             align="center"
           >
           </el-table-column>
           <el-table-column
             prop="orderConsumablePrice"
             label="耗材包价格"
-            width="200"
             align="center"
           >
           </el-table-column>
@@ -597,10 +570,6 @@ export default indexjs;
 </script>
 
 <style lang='scss' scoped>
-::v-deep .orderInfo {
-  height: 350px;
-  overflow-y: scroll;
-}
 .stationbtn {
   width: 208px;
   text-align: left;
@@ -608,5 +577,9 @@ export default indexjs;
   overflow: hidden;
   font-size: 14px;
 }
+.img {
+  width: 250px;
+  height: 250px;
+}
 </style>
 

src/views/system/order/indexjs.js

@@ -8,10 +8,12 @@ import {
     appointmentOrderDetails,
 } from "@/api/system/order";
 import { getListByUser } from "@/api/system/userlist.js";
+import baseurl from '@/api/baseurl.js'
 export default {
     name: "order",
     data() {
         return {
+            baseurl: null,
             orderStatuslist: [{
                     value: "WAIT_PAY",
                     label: "待付款",
@@ -118,6 +120,7 @@ export default {
     },
     created() {
         this.getList();
+        this.baseurl = baseurl
     },
     methods: {
         //取消预约确定按钮
@@ -174,7 +177,6 @@ export default {
                 });
                 this.query = res.data[0];
                 this.innerVisible4 = true;
-                console.log(this.query);
             });
         },
         // 派单

src/views/system/person/index.vue

@@ -89,7 +89,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['system:person:export']"
+          v-hasPermi="['system:person:importStationPerson']"
           >导入</el-button
         >
       </el-col>

src/views/system/person/indexjs.js

@@ -314,6 +314,7 @@ export default {
 
         //主页面打开护理站列表
         ParamsStation(item) {
+            this.info();
             this.innerVisiblexg = true
             this.title2 = '选择护理站'
             this.homenumber = item

src/views/system/station/index.vue

@@ -69,7 +69,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handledata"
-          v-hasPermi="['system:station:importData']"
+          v-hasPermi="['system:station:importStationInfo']"
           >导入</el-button
         >
       </el-col>

src/views/system/stationConsumable/index.vue

@@ -6,7 +6,7 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="150px"
+      label-width="110px"
     >
       <el-form-item
         label="护理站名称"
@@ -28,7 +28,7 @@
       <el-form-item label="耗材包名称" prop="consumableDetail">
         <el-input
           v-model="queryParams.consumableDetail"
-          placeholder="请输入服务项目耗材包名称"
+          placeholder="请输入耗材包名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -106,6 +106,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleport"
+          v-hasPermi="['system:stationConsumable:importStationConsumable']"
           >导入</el-button
         >
       </el-col>

src/views/system/stationConsumable/indexjs.js

@@ -99,7 +99,7 @@ export default {
                 }, ],
                 consumableDetail: [{
                     required: true,
-                    message: "请输入耗材包详情",
+                    message: "请输入耗材包名称",
                     trigger: "blur",
                 }, ],
                 consumableUnit: [{
@@ -120,7 +120,7 @@ export default {
                 nurseStationConsumables: {
                     consumableDetail: [{
                         required: true,
-                        message: "请输入耗材包详情",
+                        message: "请输入耗材包名称",
                         trigger: "blur",
                     }, ],
                     nurseStationId: [{

src/views/system/stationItem/index.vue

@@ -89,6 +89,7 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleExport"
+          v-hasPermi="['system:stationItem:importStationItem']"
           >导入</el-button
         >
       </el-col>
@@ -326,6 +327,7 @@
                   v-model="scope.row.price"
                   placeholder="小数点后两位(元)"
                   type="number"
+                  min="0"
                   oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+3)} if(value.length>6){value=value.slice(0,6)}"
                 ></el-input>
               </template>
@@ -388,6 +390,7 @@
                 <el-input
                   v-model="scope.row.consumableCount"
                   placeholder="不可输入小数点"
+                  min="0"
                   oninput="if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+0)} if(value.length>10){value=value.slice(0,10)}"
                   type="number"
                 ></el-input>

src/views/system/stationItem/stationItemjs.js

@@ -457,7 +457,6 @@ export default {
                         this.form.nurseStationItemPrices.forEach((e) => {
                             e.nurseStationItemId = this.form.nurseStationItem.id;
                         });
-                        updateNurseItem(this.form).then((response) => {
                         var obj = { pictureUrlList: [] };
                         if (this.imgone != this.form.nurseStationItem.itemPictureUrl) {
                             obj.pictureUrlList.push(this.imgone);
@@ -465,6 +464,7 @@ export default {
                         if (obj.pictureUrlList.length > 0) {
                             updatePicture(obj).then((res) => {});
                         }
+                        updateNurseItem(this.form).then((response) => {
                             this.$modal.msgSuccess("修改成功");
                             this.open = false;
                             this.getList();