产品记录查看

src/api/trace.js

@@ -10,9 +10,26 @@ export function getOrderByCode (params) {
 }
 
 // 根据产品编号追溯
-export function getProductById (productId) {
+export function getProductByCode (params) {
   return request({
-    url: request.adornUrl(`/biz-service/trace/infoProdCode/${productId}`),
+    url: request.adornUrl(`/biz-service/trace/productionList`),
+    method: 'get',
+    params: params
+  })
+}
+
+// 根据订单 Id 获取订单详情
+export function getOrderDetailById (orderId) {
+  return request({
+    url: request.adornUrl(`/biz-service/trace/infoOrderCode/${orderId}`),
+    method: 'get'
+  })
+}
+
+// 根据产品 Id 获取产品详情
+export function getProdInfoById (productionId) {
+  return request({
+    url: request.adornUrl(`/biz-service/trace/infoProdProductionId/${productionId}`),
     method: 'get'
   })
 }

src/views/modules/trace/order-detail.vue

@@ -5,8 +5,8 @@
     :close-on-click-modal="false"
     :visible.sync="visible"> -->
   <div>
-    <div class="my-title">查看</div>
-    <div style="margin-left: 20px;margin-right: 20px">
+    <div class="my-title" v-if="!prodVisible">查看</div>
+    <div v-if="!prodVisible" style="margin-left: 20px;margin-right: 20px">
       <!-- 工作流 -->
       <div v-show="dataForm.workFlowBusinessExt">
         <el-steps :active="dataForm.workFlowBusinessExt&&dataForm.workFlowBusinessExt.workFlowProcessStepList?dataForm.workFlowBusinessExt.workFlowProcessStepList.length + 2:0" align-center style="margin-bottom: 20px">
@@ -34,13 +34,12 @@
         <e-desc-item label="客户名称">{{dataForm.customerName}}</e-desc-item>
 
         <e-desc-item label="业务员">{{dataForm.salesmanName}}</e-desc-item>
-        <e-desc-item label="合同交期" span="2">{{dataForm.contactDate?dataForm.contactDate.substring(0,10):''}}</e-desc-item>
+        <e-desc-item label="合同编号">{{dataForm.contractCode}}</e-desc-item>
+        <e-desc-item label="交货日期">{{dataForm.deliveryDate ? dataForm.deliveryDate.substring(0,10) : ''}}</e-desc-item>
 
         <e-desc-item label="备注说明" span="3">{{dataForm.notes}}</e-desc-item>
       </e-desc>
-      <e-desc title="合同扫描件">
-        <upload-component :display="true" :display-title="false" :accept="'*'" :file-obj-list="fileList"/>
-      </e-desc>
+      
       <e-desc title="订单产品明细">
         <el-table
           :data="productDetails"
@@ -61,59 +60,56 @@
             label="产品名称">
           </el-table-column>
           <el-table-column
-            prop="cnt"
-            header-align="center"
-            align="center"
-            width="80"
-            label="数量">
-          </el-table-column>
-          <el-table-column
-            prop="productNumber"
+            prop="prodCode"
             header-align="center"
             align="center"
             min-width="120"
             :show-tooltip-when-overflow="true"
-            label="订单编号">
+            label="产品编号">
           </el-table-column>
           <el-table-column
-            prop="price"
+            prop="state"
             header-align="center"
             align="center"
-            label="含税单价">
+            :formatter="formatState"
+            :show-tooltip-when-overflow="true"
+            label="状态">
           </el-table-column>
           <el-table-column
-            prop="amount"
+            prop="startTime"
             header-align="center"
             align="center"
-            width="80"
-            label="含税总价">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.cnt*scope.row.price).toFixed(2) }}</span>
-            </template>
+            :show-tooltip-when-overflow="true"
+            label="开始时间">
           </el-table-column>
           <el-table-column
-            prop="rate"
+            prop="endTime"
             header-align="center"
             align="center"
-            label="税率">
-            <template slot-scope="scope">
-              <span>{{scope.row.rate?(Number(scope.row.rate * 100)).toFixed(0):''}}</span>%
-            </template>
+            :show-tooltip-when-overflow="true"
+            label="完成时间">
           </el-table-column>
           <el-table-column
-            prop="notes"
+            fixed="right"
             header-align="center"
             align="center"
             width="120"
-            :show-overflow-tooltip="true"
-            label="备注">
-          </el-table-column>
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="prodDetailHandle(scope.row.id, scope.row.prodCode)">查看记录</el-button>
+  <!--            <el-button v-if="isAuth('order:ctl:deliver') && Number(scope.row.orderState) === 3" type="text" size="small" @click="deliverHandle(scope.row.orderId)">发货</el-button>-->
+  <!--            <el-button v-if="isAuth('order:ctl:arrived') && Number(scope.row.orderState) === 4 " type="text" size="small" @click="arrivedHandle(scope.row)">送达</el-button>-->
+            </template>
+        </el-table-column>
         </el-table>
       </e-desc>
     </div>
-    <span slot="footer" class="dialog-footer">
+    <span class="dialog-footer">
       <el-button @click="onChose">返回</el-button>
     </span>
+
+    <!-- 弹窗, 新增 / 修改 -->
+    <product-detail v-if="prodVisible" ref="detail" @onChose="onChildClose"/>
   </div>
   <!-- </el-dialog> -->
 </template>
@@ -122,30 +118,50 @@
   import EDesc from '../common/e-desc'
   import EDescItem from '../common/e-desc-item'
   import { dealStepData, dealStepLogs } from '@/api/util'
-  import { getOrderDetail } from '@/api/sale'
+  import { getOrderDetailById } from '@/api/trace'
   import uploadComponent from '../common/upload-component'
   import ApproveComponent from '../common/approve-component'
+  import ProductDetail from './product-detail'
   export default {
     name: 'order-detail',
     components: {
-      EDesc, EDescItem, uploadComponent, ApproveComponent
+      EDesc, EDescItem, uploadComponent, ApproveComponent, ProductDetail
     },
     data () {
       return {
         visible: false,
         isFlow: false,
+        prodVisible: false,
         id: 0,
         dataForm: {},
         productDetails: [],
         stepList: [],
         logList: [],
-        fileList: []
+        fileList: [],
+        // 状态：1：待排产，2:生产中，3:生产完成
+        optionsState: [
+          {
+            code: '1',
+            value: '待排产'
+          },
+          {
+            code: '2',
+            value: '生产中'
+          },
+          {
+            code: '3',
+            value: '生产完成'
+          }
+        ]
       }
     },
     methods: {
       onChose () {
         this.$emit('onChose')
       },
+      onChildClose () {
+        this.prodVisible = false
+      },
       async init (id, businessType) {
         this.visible = true
         this.isFlow = !!(businessType && businessType !== '')
@@ -160,7 +176,7 @@
         this.getDetails(businessType)
       },
       getDetails (businessType) {
-        getOrderDetail(this.id).then(({data}) => {
+        getOrderDetailById(this.id).then(({data}) => {
           if (data && data.code === '200') {
             this.dataForm = data.data
             // 流程图展示
@@ -177,8 +193,8 @@
               })
             }
             // 订单产品明细
-            if (data.data.saleROrderProductList) {
-              this.productDetails = data.data.saleROrderProductList
+            if (data.data.prodProductionList) {
+              this.productDetails = data.data.prodProductionList
             }
             // 初始化审批Form
             this.showApproveForm(businessType, this.id)
@@ -197,6 +213,19 @@
       approveFinished () {
         this.onChose()
         this.$emit('approveFinished')
+      },
+      // 格式化产品状态
+      formatState (row) {
+        if (!row.state) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        return item1 ? item1.value : ''
+      },
+      // 查看产品记录
+      prodDetailHandle (productdId, prodCode) {
+        this.prodVisible = true
+        this.$nextTick(() => {
+          this.$refs.detail.init(productdId, prodCode)
+        })
       }
     }
   }

src/views/modules/trace/order-list.vue

@@ -1,9 +1,9 @@
 <!-- 订单 -->
 <template>
-  <div class="order-list">
-    <div class="my-title">订单追溯</div>
-    <div>
-      <template v-if="!detailVisible">
+  <div class="order-list" >
+    <div class="my-title" v-if="!detailVisible">订单追溯</div>
+    <div v-show="!detailVisible">
+      <template>
       <el-table
         :data="dataList"
         border
@@ -83,7 +83,7 @@
           width="120"
           label="操作">
           <template slot-scope="scope">
-            <el-button v-if="isAuth('order:ctl:info')" type="text" size="small" @click="detailHandle(scope.row.orderId)">查看</el-button>
+            <el-button type="text" size="small" @click="detailHandle(scope.row.orderId)">查看</el-button>
 <!--            <el-button v-if="isAuth('order:ctl:deliver') && Number(scope.row.orderState) === 3" type="text" size="small" @click="deliverHandle(scope.row.orderId)">发货</el-button>-->
 <!--            <el-button v-if="isAuth('order:ctl:arrived') && Number(scope.row.orderState) === 4 " type="text" size="small" @click="arrivedHandle(scope.row)">送达</el-button>-->
           </template>
@@ -105,7 +105,7 @@
     </div>
     
     <!-- 弹窗, 新增 / 修改 -->
-    <detail v-if="detailVisible" ref="detail" @onChose="onChose"/>
+    <detail v-if="detailVisible" ref="detail" @onChose="onChildClose"/>
   </div>
 </template>
 
@@ -126,7 +126,7 @@
       // 订单编码
       orderCode: {
         type: String,
-        required: true
+        default: ''
       },
       defaultTotalPage: {
         type: [Number, String],
@@ -169,6 +169,9 @@
       onChose () {
         this.$emit('onChose')
       },
+      onChildClose () {
+        this.detailVisible = false
+      },
       // 查询
       queryData () {
         this.pageIndex = 1

src/views/modules/trace/product-detail.vue

@@ -0,0 +1,121 @@
+<template>
+  <div class="production">
+    <!-- <el-dialog
+      title="生产监控详情"
+      width="70%"
+      :close-on-click-modal="false"
+      :visible.sync="visible"
+      @close="handleClose"
+    > -->
+      <div class="my-title">生产监控详情</div>
+      <el-form
+        :model="dataForm"
+        :rules="dataRule"
+        ref="dataForm"
+        label-width="auto"
+      >
+        <el-row class="my-row">
+          <el-col :span="8">
+            <el-form-item label="产品编号：">
+              <el-input v-model="dataForm.prodCode" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row
+          class="my-row"
+          style="height: 350px; background-color: #efefef;"
+        >
+          <work-flow
+            ref="workFlow"
+            :nodeData="workFlowData"
+            :selectOperator="true"
+            :disabled="true"
+          ></work-flow>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="onChose">返回</el-button>
+      </span>
+    <!-- </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import { getProdInfoById } from '@/api/trace'
+import WorkFlow from '@/components/work-flow/home'
+export default {
+  name: 'product-detail',
+  components: {
+    WorkFlow
+  },
+  data () {
+    return {
+      mouldId: '',
+      visible: false,
+      dataForm: {},
+      operatorList: [],
+      operatorIds: [],
+      productList: [],
+      display: false,
+      workFlowData: {
+        nodeList: [],
+        lineList: []
+      },
+      // 是否点击了流程图保存按钮
+      clickFlowSave: false,
+      datas: {},
+      dataRule: {
+        mouldName: [
+          { required: true, message: '请输入模板名称', trigger: 'blur' }
+        ]
+      },
+      dataRule1: {
+        operatorIds: [
+          { required: true, message: '操作人员不能为空', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  mounted () {
+    this.visible = true
+  },
+  methods: {
+    onChose () {
+      this.$emit('onChose')
+    },
+    // 初始化表单
+    async init (id, prodCode, disable) {
+      console.log(prodCode)
+      this.visible = true
+      this.display = disable
+      this.nodeList = []
+      this.linkList = []
+      this.mouldId = id
+      this.dataForm.prodCode = prodCode
+
+      await getProdInfoById(id).then(async ({ data }) => {
+        if (data && data.code === '200') {
+          this.dataForm = {
+            ...this.dataForm
+          }
+          // 流程图展示
+          this.workFlowData = {
+            nodeList: data.data.nodeList,
+            lineList: data.data.lineList
+          }
+        }
+      })
+    },
+    handleClose () {
+      this.$emit('close')
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+/deep/ .my-row .super-flow__node {
+  width: 180px;
+  height: 80px;
+}
+</style>

src/views/modules/trace/product-list.vue

@@ -0,0 +1,207 @@
+<!-- 产品追溯列表 -->
+<template>
+  <div class="product-list">
+    <template v-if="!detailsVisible">
+      <el-table
+        :data="dataList"
+        border
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          label="序号"
+          type="index"
+          width="50"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="prodCode"
+          header-align="center"
+          align="center"
+          min-width="100"
+          :show-tooltip-when-overflow="true"
+          label="产品编号">
+        </el-table-column>
+        <el-table-column
+          prop="productName"
+          header-align="center"
+          align="center"
+          min-width="160"
+          :show-tooltip-when-overflow="true"
+          label="产品名称">
+        </el-table-column>
+        <el-table-column
+          prop="progressBar"
+          header-align="center"
+          align="center"
+          min-width="100"
+          label="生产进度">
+          <template slot-scope="scope">
+            <el-progress :percentage="scope.row.progressBar?Number(scope.row.progressBar):0"></el-progress>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="contactDate"
+          header-align="center"
+          align="center"
+          min-width="160"
+          label="交期时间">
+        </el-table-column>
+        <el-table-column
+          prop="orderCode"
+          header-align="center"
+          align="center"
+          min-width="120"
+          :show-tooltip-when-overflow="true"
+          label="订单编码">
+        </el-table-column>
+        <el-table-column
+          prop="customerName"
+          header-align="center"
+          align="center"
+          min-width="160"
+          :show-tooltip-when-overflow="true"
+          label="客户名称">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button v-if="isAuth('prod:monitoring:info')" type="text" size="small" @click="detail(scope.row.id, scope.row.prodCode, true)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="sizeChangeHandle"
+        @current-change="currentChangeHandle"
+        :current-page="pageIndex"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="pageSize"
+        :total="totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+    </template>
+    <!-- 弹窗, 查看 -->
+    <detail v-if="detailsVisible" ref="details" @close="closeDialogEvent" @refreshDataList="getDataList" @onChose="onChose"/>
+  </div>
+</template>
+
+<script>
+  import Detail from './product-detail'
+  import { getProductByCode } from '@/api/trace'
+  export default {
+    name: 'product-list',
+    components: {Detail},
+    props: {
+      // 默认第一页的数据
+      defaultList: {
+        type: Array,
+        default: []
+      },
+      // 订单编码
+      productCode: {
+        type: String,
+        default: ''
+      },
+      defaultTotalPage: {
+        type: [Number, String],
+        default: 0
+      }
+    },
+    data () {
+      return {
+        detailsVisible: false,
+        dataForm: {},
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: Number(this.defaultTotalPage),
+        dataListLoading: false,
+        dataListSelections: [],
+        // 状态：1：待排产，2:生产中，3:生产完成
+        optionsState: [
+          {
+            code: '1',
+            value: '待排产'
+          },
+          {
+            code: '2',
+            value: '生产中'
+          },
+          {
+            code: '3',
+            value: '生产完成'
+          }
+        ]
+      }
+    },
+    created () {
+    },
+    methods: {
+      onChose () {
+        this.detailsVisible = false
+      },
+      // 查询
+      queryPage () {
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        let params = {
+          'current': this.pageIndex,
+          'size': this.pageSize,
+          'prodCode': this.productCode
+        }
+        getProductByCode(params).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataList = data.data.records
+            this.totalPage = Number(data.data.total)
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          console.log('monitor')
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+      // 新增 / 修改
+      detail (id, prodCode, disable) {
+        this.detailsVisible = true
+        this.$nextTick(() => {
+          this.$refs.details.init(id, prodCode, disable)
+        })
+      },
+      // 创建新产品
+      createNewProduct () {
+        this.$message.warning('功能暂未开放')
+      },
+      closeDialogEvent () {
+        this.detailsVisible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
+

src/views/modules/trace/search.vue

@@ -1,7 +1,7 @@
 <!-- 追溯中心 -->
 <template>
   <div class="trace">
-    <template v-if="!orderListVisible">
+    <template v-if="!orderListVisible && !productListVisible">
       <div style="margin-top: 15px;">
         <el-input :placeholder="codePlaceHoler" v-model.trim="code" class="input-with-select">
           <el-select v-model="type" slot="prepend" placeholder="请选择">
@@ -14,6 +14,7 @@
     </template>
     <!-- 弹窗, 新增 / 修改 -->
     <order-list v-if="orderListVisible" :defaultList="defaultOrderList" :orderCode="code" :defaultTotalPage="defaultOrderTotal" ref="orderList" @onChose="onChose"/>      
+    <product-list v-if="productListVisible" :defaultList="defaultProductList" :productCode="code" :defaultTotalPage="defaultProductTotal" ref="productList" @onChose="onChose"></product-list>
   </div>
   
 </template>
@@ -21,17 +22,20 @@
 
 <script>
 import orderList from './order-list'
-import { getOrderByCode, getProductById } from '@/api/trace'
+import ProductList from './product-list'
+import { getOrderByCode, getProductByCode } from '@/api/trace'
 export default {
   name: 'trace-search',
   components: {
-    orderList
+    orderList,
+    ProductList
   },
   data () {
     return {
       type: '1',
       code: '',
       orderListVisible: false,
+      productListVisible: false,
       searchloading: false,
       defaultOrderList: [],
       defaultOrderTotal: 0
@@ -42,6 +46,7 @@ export default {
   methods: {
     onChose () {
       this.orderListVisible = false
+      this.productListVisible = false
     },
     search () {
       if (this.code === '') {
@@ -50,6 +55,7 @@ export default {
       }
       this.searchloading = true
       let that = this
+      // 订单追溯
       if (this.type === '1') {
         let params = {orderCode: this.code}
         getOrderByCode(params).then(({data}) => {
@@ -63,13 +69,23 @@ export default {
           }
         }).catch(function (error) {
           console.log(error.response.data)
-          that.$message.error('未找到任何数据')
+          that.$message.error('服务器异常')
         }).then(() => {
           this.searchloading = false
         })
-      } else if (this.type === '2') {
-        getProductById(this.code).then(({data}) => {
-          if (data && data.code === '200') {
+      } else if (this.type === '2') { // 产品追溯
+        let params = {
+          'prodCode': this.code
+        }
+        console.log(params)
+        getProductByCode(params).then(({data}) => {
+          console.log(data)
+          if (data && data.code === '200' && data.data) {
+            this.defaultProductList = data.data.records
+            this.defaultProductTotal = data.data.total
+            this.productListVisible = true
+          } else {
+            that.$message.error(data.msg)
           }
         }).then(() => {
           this.searchloading = false