ソースを参照

[bug]
修复2个bug

天梦 2 年 前
コミット
d9da043819

+ 12 - 0
.env.staging

@@ -0,0 +1,12 @@
+# 页面标题
+VUE_APP_TITLE = 中药房管理系统
+
+NODE_ENV = production
+
+# 测试环境配置
+ENV = 'staging'
+
+# 中药房管理系统/测试环境
+VUE_APP_BASE_API = 'http://106.14.106.155:8005/'
+
+#VUE_APP_BASE_API = 'http://wbivsd.natappfree.cc'

+ 1 - 1
src/views/pharmacyManagement/business/deploy/audit.vue

@@ -870,7 +870,7 @@ export default {
         }
       )
         .then(function () {
-          return releaseOrder({id:ids});
+          return releaseOrder({ids:ids});
         })
         .then(() => {
           this.getList();

+ 130 - 129
src/views/pharmacyManagement/business/deploy/index.vue

@@ -318,7 +318,7 @@
             >
               {{ item.name }}
             </el-tag>
-            <i v-if="item.id<deployStateArr.length-1" class="el-icon-d-arrow-right el-icon--right" style="display:flex;align-items:center;"></i>
+            <i v-if="item.id<16" class="el-icon-d-arrow-right el-icon--right" style="display:flex;align-items:center;"></i>
           </div>
         </div>
         <el-divider></el-divider>
@@ -339,137 +339,137 @@
             <div class="title body">照片:</div>
           </div>
           <div class="deploy">
-            <div class="body">
-              <el-image v-for="img in prescriptionFiles"
+            <div class="body" v-if="depolyStatusObj.prescriptionFiles.length>0&&depolyStatusObj.prescriptionFiles[0].length>4">
+              <el-image v-for="img in depolyStatusObj.prescriptionFiles"
               style="width: 100px; height: 100px"
-              :src="img"
-              :fit="fit"></el-image>
+              :src="img.length>4?img:''"
+              fit="fill"></el-image>
             </div>
           </div>
         </div>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="抓药记录" name="first">
-            <el-table
-              v-loading="loading"
-              :data="detailData.zy||[]"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="index" width="55" align="center" />
-              <el-table-column
-                label="扫码时间"
-                align="center"
-                prop="createTime"
-              />
-              <el-table-column
-                label="操作人"
-                align="center"
-                prop="createBy"
-              />
-              <el-table-column label="照片" align="center">
-                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>
-              </el-table-column>
-              <el-table-column label="备注" align="center" prop="remarks" />
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="复核记录" name="second">
-            <el-table
-              v-loading="loading"
-              :data="detailData.fh||[]"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="index" width="55" align="center" />
-              <el-table-column
-                label="扫码时间"
-                align="center"
-                prop="createTime"
-              />
-              <el-table-column
-                label="操作人"
-                align="center"
-                prop="createBy"
-              />
-              <el-table-column label="照片" align="center">
-                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>
-              </el-table-column>
-              <el-table-column label="备注" align="center" prop="remarks" />
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="浸泡记录" name="third">
-            <el-table
-              v-loading="loading"
-              :data="detailData.jp||[]"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="index" width="55" align="center" />
-              <el-table-column
-                label="扫码时间"
-                align="center"
-                prop="createTime"
-              />
-              <el-table-column
-                label="操作人"
-                align="center"
-                prop="createBy"
-              />
-              <el-table-column label="照片" align="center">
-                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>
-              </el-table-column>
-              <el-table-column label="备注" align="center" prop="remarks" />
-            </el-table>
-          </el-tab-pane>
-          <el-tab-pane label="煎煮记录" name="decoct">
-            <el-table
-              v-loading="loading"
-              :data="detailData.jz||[]"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="index" width="55" align="center" />
-              <el-table-column
-                label="扫码时间"
-                align="center"
-                prop="createTime"
-              />
-              <el-table-column
-                label="操作人"
-                align="center"
-                prop="createBy"
-              />
-              <el-table-column label="照片" align="center">
-                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>
-              </el-table-column>
-              <el-table-column
-                label="备注"
-                align="center"
-                prop="remarks"
-              /> </el-table
-          ></el-tab-pane>
-          <el-tab-pane label="打包记录" name="pack">
-            <el-table
-              v-loading="loading"
-              :data="detailData.db||[]"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="index" width="55" align="center" />
-              <el-table-column
-                label="扫码时间"
-                align="center"
-                prop="createTime"
-              />
-              <el-table-column
-                label="操作人"
-                align="center"
-                prop="createBy"
-              />
-              <el-table-column label="照片" align="center">
-                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>
-              </el-table-column>
-              <el-table-column
-                label="备注"
-                align="center"
-                prop="remarks"
-              /> </el-table
-          ></el-tab-pane>
-        </el-tabs>
+<!--        <el-tabs v-model="activeName" @tab-click="handleClick">-->
+<!--          <el-tab-pane label="抓药记录" name="first">-->
+<!--            <el-table-->
+<!--              v-loading="loading"-->
+<!--              :data="detailData.zy||[]"-->
+<!--              @selection-change="handleSelectionChange"-->
+<!--            >-->
+<!--              <el-table-column type="index" width="55" align="center" />-->
+<!--              <el-table-column-->
+<!--                label="扫码时间"-->
+<!--                align="center"-->
+<!--                prop="createTime"-->
+<!--              />-->
+<!--              <el-table-column-->
+<!--                label="操作人"-->
+<!--                align="center"-->
+<!--                prop="createBy"-->
+<!--              />-->
+<!--              <el-table-column label="照片" align="center">-->
+<!--                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="备注" align="center" prop="remarks" />-->
+<!--            </el-table>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="复核记录" name="second">-->
+<!--            <el-table-->
+<!--              v-loading="loading"-->
+<!--              :data="detailData.fh||[]"-->
+<!--              @selection-change="handleSelectionChange"-->
+<!--            >-->
+<!--              <el-table-column type="index" width="55" align="center" />-->
+<!--              <el-table-column-->
+<!--                label="扫码时间"-->
+<!--                align="center"-->
+<!--                prop="createTime"-->
+<!--              />-->
+<!--              <el-table-column-->
+<!--                label="操作人"-->
+<!--                align="center"-->
+<!--                prop="createBy"-->
+<!--              />-->
+<!--              <el-table-column label="照片" align="center">-->
+<!--                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="备注" align="center" prop="remarks" />-->
+<!--            </el-table>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="浸泡记录" name="third">-->
+<!--            <el-table-->
+<!--              v-loading="loading"-->
+<!--              :data="detailData.jp||[]"-->
+<!--              @selection-change="handleSelectionChange"-->
+<!--            >-->
+<!--              <el-table-column type="index" width="55" align="center" />-->
+<!--              <el-table-column-->
+<!--                label="扫码时间"-->
+<!--                align="center"-->
+<!--                prop="createTime"-->
+<!--              />-->
+<!--              <el-table-column-->
+<!--                label="操作人"-->
+<!--                align="center"-->
+<!--                prop="createBy"-->
+<!--              />-->
+<!--              <el-table-column label="照片" align="center">-->
+<!--                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="备注" align="center" prop="remarks" />-->
+<!--            </el-table>-->
+<!--          </el-tab-pane>-->
+<!--          <el-tab-pane label="煎煮记录" name="decoct">-->
+<!--            <el-table-->
+<!--              v-loading="loading"-->
+<!--              :data="detailData.jz||[]"-->
+<!--              @selection-change="handleSelectionChange"-->
+<!--            >-->
+<!--              <el-table-column type="index" width="55" align="center" />-->
+<!--              <el-table-column-->
+<!--                label="扫码时间"-->
+<!--                align="center"-->
+<!--                prop="createTime"-->
+<!--              />-->
+<!--              <el-table-column-->
+<!--                label="操作人"-->
+<!--                align="center"-->
+<!--                prop="createBy"-->
+<!--              />-->
+<!--              <el-table-column label="照片" align="center">-->
+<!--                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                label="备注"-->
+<!--                align="center"-->
+<!--                prop="remarks"-->
+<!--              /> </el-table-->
+<!--          ></el-tab-pane>-->
+<!--          <el-tab-pane label="打包记录" name="pack">-->
+<!--            <el-table-->
+<!--              v-loading="loading"-->
+<!--              :data="detailData.db||[]"-->
+<!--              @selection-change="handleSelectionChange"-->
+<!--            >-->
+<!--              <el-table-column type="index" width="55" align="center" />-->
+<!--              <el-table-column-->
+<!--                label="扫码时间"-->
+<!--                align="center"-->
+<!--                prop="createTime"-->
+<!--              />-->
+<!--              <el-table-column-->
+<!--                label="操作人"-->
+<!--                align="center"-->
+<!--                prop="createBy"-->
+<!--              />-->
+<!--              <el-table-column label="照片" align="center">-->
+<!--                <template slot-scope="scope"><el-image style="width:60px;height:60px" :src="scope.row.prescriptionFiles.length?$baseUrl+'/profile/ys/'+scope.row.prescriptionFiles[0].url:''" :preview-src-list="[scope.row.prescriptionFiles.length?$baseUrl+'/profile/'+scope.row.prescriptionFiles[0].url:'']"></el-image></template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                label="备注"-->
+<!--                align="center"-->
+<!--                prop="remarks"-->
+<!--              /> </el-table-->
+<!--          ></el-tab-pane>-->
+<!--        </el-tabs>-->
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -538,7 +538,7 @@ export default {
         createTime:'2023-07-08 10:10:10',
         operate:'人工',
         createBy:'A医生',
-        prescriptionFiles:['url1','url2','url3'],
+        prescriptionFiles:['','',''],
         remarks:'A医生完成了jp操作'
       },
       effectStatus:'plain',
@@ -815,6 +815,7 @@ h3 {
   align-items: center;
 }
 .title{
+  margin-bottom: 0;
   font-weight: bolder;
   justify-content: flex-end!important;
   width: 90px!important;