瀏覽代碼

物料工艺方案列表-部分

damon227 2 年之前
父節點
當前提交
ee3143eda2

+ 100 - 2
src/views/modules/order/order-add-or-update.vue

@@ -29,7 +29,7 @@
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="auto">
         <el-row class="my-row">
           <el-col :span="8">
-            <el-form-item label="单编码" prop="orderCode">
+            <el-form-item label="任务单编码" prop="orderCode">
               <el-input v-model="dataForm.orderCode" :disabled="true" placeholder="系统自动生成"></el-input>
             </el-form-item>
           </el-col>
@@ -77,7 +77,7 @@
           </el-form-item>
         </el-row>
         <el-row class="my-row">
-          <div class="title"><span style="color: red">*</span> 单产品明细</div>
+          <div class="title"><span style="color: red">*</span> 任务单产品明细</div>
           <el-table
             :data="productDetails"
             border
@@ -178,6 +178,100 @@
             <el-button :disabled="addType === 2" v-show="!display" type="primary" icon="el-icon-plus" @click="addProduct"></el-button>
           </el-row>
         </el-row>
+        <el-row class="my-row">
+          <div class="title"><span style="color: red">*</span> 任务工单派发</div>
+          <el-table
+            :data="productDetails"
+            border
+            style="width: 100%;">
+            <el-table-column
+              label="序号"
+              type="index"
+              width="50"
+              align="center">
+            </el-table-column>
+            <el-table-column
+              prop="productName"
+              header-align="center"
+              align="center"
+              min-width="80"
+              :show-tooltip-when-overflow="true"
+              label="工单类型">
+            </el-table-column>
+            <el-table-column
+              prop="productSpecifications"
+              header-align="center"
+              align="center"
+              min-width="120"
+              :show-tooltip-when-overflow="true"
+              label="工单名称">
+            </el-table-column>
+            <el-table-column
+              prop="cnt"
+              header-align="center"
+              align="center"
+              min-width="50"
+              label="级别">
+            </el-table-column>
+            <el-table-column
+              prop="productNumber"
+              header-align="center"
+              align="center"
+              min-width="160"
+              :show-tooltip-when-overflow="true"
+              label="工单内容">
+            </el-table-column>
+            <el-table-column
+              prop="price"
+              header-align="center"
+              align="center"
+              min-width="100"
+              label="任务接收人">
+            </el-table-column>
+            <el-table-column
+              prop="amount"
+              header-align="center"
+              align="center"
+              min-width="80"
+              label="要求完成时间">
+              <template slot-scope="scope">
+                <span>{{ (scope.row.cnt*scope.row.price).toFixed(1) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="rate"
+              header-align="center"
+              align="center"
+              min-width="100"
+              label="任务单附件">
+              <template slot-scope="scope">
+                {{scope.row.rate}}%
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="notes"
+              header-align="center"
+              align="center"
+              width="120"
+              :show-tooltip-when-overflow="true"
+              label="备注">
+            </el-table-column>
+            <el-table-column
+              fixed="right"
+              header-align="center"
+              align="center"
+              width="100"
+              label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" size="small" @click="updateProductHandle(scope.row)">编辑</el-button>
+                <el-button style="color: red" type="text" size="small" @click="deleteProductHandle(scope.row.recordId)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row style="text-align: center; margin-top: 10px;">
+            <el-button :disabled="addType === 2" v-show="!display" type="primary" icon="el-icon-plus" @click="addProductV2"></el-button>
+          </el-row>
+        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
           <el-button @click="onChose">取消</el-button>
@@ -362,6 +456,10 @@
       // 删除产品项
       deleteProductHandle (recordId) {
         this.productDetails.splice(this.productDetails.findIndex((item) => item.recordId === recordId), 1)
+      },
+      //添加任务工单派发
+      addProductV2 () {
+
       }
     }
   }

+ 226 - 0
src/views/modules/tech-manage/pro-tech-manage.vue

@@ -0,0 +1,226 @@
+<!-- 工艺方案管理 -->
+<template>
+  <div class="stock">
+    <template v-if="!addOrUpdateVisible && !detailVisible">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
+        <el-form-item label="名称">
+          <el-input v-model="dataForm.optionName" placeholder="请输入产品名称" clearable/>
+        </el-form-item>
+        <el-form-item label="创建日期">
+          <el-date-picker
+            v-model="dataForm.createTime"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="物料">
+          <el-select
+            v-model="dataForm.productId"
+            remote
+            placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.code"
+              :label="item.value"
+              :value="item.code">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="search()">查询</el-button>
+          <el-button v-if="isAuth('cus:customer:save')" type="primary" @click="addOrUpdateHandle(0, false)">新建</el-button>
+          <el-button v-if="isAuth('cus:customer:save')" type="primary" @click="addOrUpdateHandle(0, false)">变更通知人设置</el-button>
+        </el-form-item>
+      </el-form>
+      <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="optionCode"
+          header-align="center"
+          align="center"
+          min-width="120"
+          :show-tooltip-when-overflow="true"
+          label="方案编码">
+        </el-table-column>
+        <el-table-column
+          prop="optionName"
+          header-align="center"
+          align="center"
+          min-width="120"
+          label="方案名称">
+        </el-table-column>
+        <el-table-column
+          prop="materialName"
+          header-align="center"
+          align="center"
+          min-width="120"
+          label="物料名称">
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          header-align="center"
+          align="center"
+          width="120"
+          :show-tooltip-when-overflow="true"
+          label="方案文件">
+        </el-table-column>
+        <el-table-column
+          prop="optionAlter"
+          header-align="center"
+          align="center"
+          label="更改说明">
+        </el-table-column>
+        <el-table-column
+          prop="notes"
+          header-align="center"
+          align="center"
+          min-width="180"
+          :show-tooltip-when-overflow="true"
+          label="更改单">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          header-align="center"
+          align="center"
+          :show-tooltip-when-overflow="true"
+          label="备注">
+        </el-table-column>
+        <el-table-column
+          prop="createTime"
+          header-align="center"
+          align="center"
+          min-width="120"
+          :show-tooltip-when-overflow="true"
+          label="创建时间">
+        </el-table-column>
+        <el-table-column
+          prop="creatorName"
+          header-align="center"
+          align="center"
+          :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('cus:customer:info')" type="text" size="small" @click="detailHandle(scope.row.customerId)">查看</el-button>
+            <el-button v-if="isAuth('cus:customer:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.customerId, false)">编辑</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>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'pro-tech-manage',
+    components: {
+      
+    },
+    data () {
+      return {
+        addOrUpdateVisible: false,
+        detailVisible: false,
+        dataForm: {
+          optionName: ''
+        },
+        options: [],
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+      }
+    },
+    created () {
+     this.getDataList()
+    },
+    methods: {
+      // 查询
+      search () {
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 获取数据列表
+      getDataList () {
+        this.addOrUpdateVisible = false
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/biz-service/pro-technology-option/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'optionName': this.dataForm.optionName,
+            'productId': this.dataForm.productId,
+            'createTimeS': this.dataForm.createTime ? this.dataForm.createTime[0] : null,
+            'createTimeE': this.dataForm.createTime ? this.dataForm.createTime[1] : null
+          })
+        }).then(({data}) => {
+          if (data && data.code === '200') {
+            this.dataList = data.data.records
+            this.totalPage = Number(data.data.total)
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id, disabled) {
+        this.addOrUpdateVisible = true
+        // this.$nextTick(() => {
+        //   this.$refs.addOrUpdate.init(id, disabled)
+        // })
+      },
+       detailHandle (id) {
+        this.detailVisible = true
+        // this.$nextTick(() => {
+        //   this.$refs.detail.init(id)
+        // })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

+ 58 - 10
src/views/modules/tech/product-management.vue

@@ -42,7 +42,29 @@
           align="center"
           min-width="100"
           :show-tooltip-when-overflow="true"
-          label="产品编码">
+          label="物料编码">
+        </el-table-column>
+        <el-table-column
+          prop="productType"
+          header-align="center"
+          align="center"
+          min-width="120"
+          :formatter="typeFormat"
+          label="类别">
+        </el-table-column>
+        <el-table-column
+          prop="isCompose"
+          header-align="center"
+          align="center"
+          min-width="120"
+          :formatter="composeFormat"
+          label="是否组合">
+        </el-table-column>
+        <el-table-column
+          prop="productName"
+          header-align="center"
+          align="center"
+          label="图号">
         </el-table-column>
         <el-table-column
           prop="productName"
@@ -50,23 +72,49 @@
           align="center"
           min-width="140"
           :show-tooltip-when-overflow="true"
-          label="产品名称">
+          label="物料名称">
         </el-table-column>
         <el-table-column
-          prop="productType"
+          prop="productSpec"
           header-align="center"
           align="center"
-          min-width="120"
-          :formatter="typeFormat"
-          label="产品类别">
+          label="物料规格">
         </el-table-column>
         <el-table-column
-          prop="isCompose"
+          prop="productSpec"
           header-align="center"
           align="center"
-          min-width="120"
-          :formatter="composeFormat"
-          label="是否组合产品">
+          label="材料">
+        </el-table-column>
+        <el-table-column
+          prop="productSpec"
+          header-align="center"
+          align="center"
+          label="单套数量">
+        </el-table-column>
+        <el-table-column
+          prop="productSpec"
+          header-align="center"
+          align="center"
+          label="单位">
+        </el-table-column>
+        <el-table-column
+          prop="productSpec"
+          header-align="center"
+          align="center"
+          label="物料尺寸">
+        </el-table-column>
+        <el-table-column
+          prop="productSpec"
+          header-align="center"
+          align="center"
+          label="展开尺寸">
+        </el-table-column>
+        <el-table-column
+          prop="productSpec"
+          header-align="center"
+          align="center"
+          label="表面处理">
         </el-table-column>
         <el-table-column
           prop="sourceName"