zhuhao před 2 roky
rodič
revize
bb6c168ac0

+ 1 - 1
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/dashboard/index.vue

@@ -34,7 +34,7 @@
           <h1>¥<countTo :duration="3000" :end-val="indexCount.amountCount.todayAmount" :start-val="0"/><span class="danweiSpan">元</span></h1>          
 		   <h2>
 				<span style="width:30%;">¥<countTo :duration="3000" :end-val="indexCount.amountCount.yesterdayAmount" :start-val="0"/></span>
-				<span style="width:30%;">¥<countTo :duration="3000" :end-val="indexCount.amountCount.sevenAmount" :start-val="0"/></span>				
+				<span style="width:30%;">¥<countTo :duration="3000" :end-val="indexCount.amountCount.sevenAmount"  :decimals="2"  :start-val="0"/></span>				
            </h2>
            <h3 class="col">
 				<span>昨日收入</span>

+ 5 - 5
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/company/Index.vue

@@ -59,14 +59,14 @@
     <el-row class="filter-container">
       <el-col>
         <!--添加按钮,调用add方法-->
-        <el-button type="primary" icon="el-icon-plus" size="medium" @click="add">{{ $t("common.add") }}</el-button>
+        <!-- <el-button type="primary" icon="el-icon-plus" size="medium" @click="add">{{ $t("common.add") }}</el-button> -->
         <!--修改按钮,调用edit-->
         <el-button type="success" icon="el-icon-edit" size="medium" @click="editOne">
           {{ $t("common.edit") }}
         </el-button>
-        <el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
+        <!-- <el-button type="danger" icon="el-icon-delete" size="medium" @click="batchDelete">
           {{ $t("table.delete") }}
-        </el-button>
+        </el-button> -->
       </el-col>
     </el-row>
 
@@ -167,8 +167,8 @@
              style="color: #2db7f5;"/>
           <i @click="edit(row)" class="el-icon-edit table-operation" :title="$t('common.edit')"
              style="color: #2db7f5;"/>
-          <i @click="singleDelete(row)" class="el-icon-delete table-operation" :title="$t('common.delete')"
-             style="color: #f50;"/>
+          <!-- <i @click="singleDelete(row)" class="el-icon-delete table-operation" :title="$t('common.delete')"
+             style="color: #f50;"/> -->
           <el-link class="no-perm">
 
           </el-link>

+ 3 - 3
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/order/orderDetail.vue

@@ -10,7 +10,7 @@
   >
 
     <!--    订单状态-->
-    <el-descriptions title="订单状态" border>
+    <!-- <el-descriptions title="订单状态" border>
       <el-descriptions-item>
         <el-steps :active="1">
           <el-step title="支付" description=""></el-step>
@@ -19,7 +19,7 @@
           <el-step title="完成" description="这段就没那么长了"></el-step>
         </el-steps>
       </el-descriptions-item>
-    </el-descriptions>
+    </el-descriptions> -->
     <!--    商品信息-->
     <el-descriptions title="商品信息" border>
       <el-descriptions-item label="订单号">{{ detail.orderId }}</el-descriptions-item>
@@ -32,7 +32,7 @@
         <el-tag size="small">{{ detail.goodsName }}</el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="图片">
-        <el-image
+        <el-image style="width: 100px; height: 100px"
           :src="detail.goodsPic"
         ></el-image>
       </el-descriptions-item>

+ 4 - 4
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/MaterialMgr.vue

@@ -19,9 +19,9 @@
         新增料筒
       </el-button>
 
-        <el-button @click="changeMtrInBar" class="filter-item" plain type="primary">
+        <!-- <el-button @click="changeMtrInBar" class="filter-item" plain type="primary">
         换料
-      </el-button>
+      </el-button> -->
 
       </span>
         </el-col>
@@ -130,8 +130,8 @@
           :label="$t('table.operation')" align="center" column-key="operation" class-name="small-padding fixed-width"
           width="100px">
           <template slot-scope="{ row }">
-            <i @click="changeMtr(row)" class="el-icon-edit table-operation" :title="$t('common.edit')"
-               style="color: #2db7f5;"/>
+            <!-- <i @click="changeMtr(row)" class="el-icon-edit table-operation" :title="$t('common.edit')"
+               style="color: #2db7f5;"/> -->
             <i @click="singleDelete(row)" class="el-icon-delete table-operation" :title="$t('common.delete')"
                style="color: #f50;"/>
           </template>

+ 16 - 9
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/allOrders.vue

@@ -132,6 +132,7 @@
           {{ scope.row.orderStatus === '3' ? $t("btOrder.status.scwc") : '' }}
           {{ scope.row.orderStatus === '4' ? $t("btOrder.status.yc") : '' }}
           {{ scope.row.orderStatus === '5' ? $t("btOrder.status.zrtk") : '' }}
+          {{ scope.row.orderStatus === '6' ? $t("btOrder.status.qbwc") : '' }}
         </template>
       </el-table-column>
       <el-table-column
@@ -146,14 +147,18 @@
     </el-table>
     <pagination :limit.sync="queryParams.size" :page.sync="queryParams.current"
                 :total="Number(tableData.total)" @pagination="fetch" v-show="tableData.total > 0"/>
+ 
+		<el-dialog
+		  :title='$t("btOrder.detail")'
+		  :visible.sync="detailDialog.isVisible"
+		  width="1000px"
+		  append-to-body
+      ref="orderDetail"
+		>
+			<order-detail :recordEquiment="recordEquiment" ref="orderDetail" :type="detailDialog.type"  @close="orderDetailClose" @success="editSuccess"></order-detail>
+		</el-dialog>  
 
-    <order-detail
-      :dialog-visible="detailDialog.isVisible"
-      :type="detailDialog.type"
-      @close="orderDetailClose"
-      @success="editSuccess"
-      ref="orderDetail"/>
-  </div>
+</div>
 
 
 </template>
@@ -185,7 +190,7 @@ export default {
         text: '异常', value: '4'}, {text: '转入退款', value: '5'}],
       // :filters="[{ text: $t('common.status.valid'), value: '1' },{ text: $t('common.status.invalid'), value: '0' }]"
 
-
+      recordEquiment: {},
       // 编辑
       dialog: {
         isVisible: false,
@@ -363,9 +368,11 @@ export default {
     },
 
     orderDetail(row) {
+      this.recordEquiment = row
       this.detailDialog.type = "orderDetail";
       this.detailDialog.isVisible = true;
-      this.$refs.orderDetail.orderDetail(row['id']);
+      //console.log("this.$refs=",this.$refs.orderDetail.parent)
+      //this.$refs.orderDetail.orderDetail(row['id']);
     },
 
 

+ 15 - 17
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/productionresource/components/orderDetail.vue

@@ -1,16 +1,7 @@
 <template>
-  <el-dialog
-    :close-on-click-modal="false"
-    :close-on-press-escape="true"
-    :title="title"
-    :type="type"
-    :visible.sync="isVisible"
-    :width="width"
-    top="50px"
-  >
-
+  <div class="">
     <!--    订单状态-->
-    <el-descriptions title="订单状态" border>
+    <!-- <el-descriptions title="订单状态" border>
       <el-descriptions-item>
         <el-steps :active="1">
           <el-step title="支付" description=""></el-step>
@@ -19,7 +10,7 @@
           <el-step title="完成" description="这段就没那么长了"></el-step>
         </el-steps>
       </el-descriptions-item>
-    </el-descriptions>
+    </el-descriptions> -->
     <!--    商品信息-->
     <el-descriptions title="商品信息" border>
       <el-descriptions-item label="订单号">{{ detail.orderId }}</el-descriptions-item>
@@ -31,8 +22,10 @@
       <el-descriptions-item label="商品名称">
         <el-tag size="small">{{ detail.goodsName }}</el-tag>
       </el-descriptions-item>
-      <el-descriptions-item label="图片">
-        <el-tag size="small">{{ detail.goodsPic }}</el-tag>
+<el-descriptions-item label="图片">
+        <el-image style="width: 100px; height: 100px"
+          :src="detail.goodsPic"
+        ></el-image>
       </el-descriptions-item>
       <el-descriptions-item label="购买规格">
         <el-tag size="small">{{ detail.specName }}</el-tag>
@@ -70,7 +63,7 @@
     </el-descriptions>
 
 
-  </el-dialog>
+  </div>
 
 </template>
 
@@ -96,6 +89,7 @@ export default {
       type: String,
       default: "add"
     },
+    recordEquiment: Object
   },
   data() {
     return {
@@ -211,6 +205,7 @@ export default {
 
     };
   },
+ 
   computed: {
     isVisible: {
       get() {
@@ -232,8 +227,9 @@ export default {
         this.width = this.initWidth();
       })();
     };
-    // 加载数据
-    // this.getCateList()
+    // 加载数据 
+    console.log("this.recordEquiment.id==",this.recordEquiment.id)
+    this.orderDetail(this.recordEquiment.id) 
   },
   methods: {
 
@@ -367,6 +363,7 @@ export default {
 
 
     orderDetail(orderId) {
+      console.log("orderId===",orderId)
       this.getOrderDetail(orderId);
 
     },
@@ -375,6 +372,7 @@ export default {
       orderApi.getOrderDetail({orderId: orderId}).then(response => {
         const res = response.data;
         if (res.isSuccess) {
+          console.log("orderId===",res.data)
           this.detail = res.data;
         }
       }).finally(() => this.loading = false);