feat: 分切下料，送气胀轴，套轴绑定

lms2/nladmin-ui/src/views/wms/pdm/ivt/bcutpointivt/index.vue

@@ -186,7 +186,11 @@
         <el-table-column prop="truss_point_code1" label="桁架点位编码1 " :min-width="flexWidth('truss_point_code1',crud.data,'桁架点位编码1 ')" />
         <el-table-column prop="truss_point_code2" label="桁架点位编码2" :min-width="flexWidth('truss_point_code2',crud.data,'桁架点位编码2')" />
         <el-table-column prop="qzz_no1" label="气胀轴编码1" :min-width="flexWidth('qzz_no1',crud.data,'气胀轴编码1')" />
+        <el-table-column prop="up_gx1" label="上轴管芯1" :min-width="flexWidth('up_gx1',crud.data,'气胀轴编码1')" />
+        <el-table-column prop="up_gx2" label="上轴管芯2" :min-width="flexWidth('up_gx2',crud.data,'气胀轴编码2')" />
         <el-table-column prop="qzz_no2" label="气胀轴编码2" :min-width="flexWidth('qzz_no2',crud.data,'气胀轴编码2')" />
+        <el-table-column prop="down_gx1" label="下轴管芯1" :min-width="flexWidth('down_gx1',crud.data,'气胀轴编码1')" />
+        <el-table-column prop="down_gx2" label="下轴管芯2" :min-width="flexWidth('down_gx2',crud.data,'气胀轴编码2')" />
         <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型型')">
           <template slot-scope="scope">
             {{ dict.label.BCUT_POINT_TYPE[scope.row.point_type] }}

lms2/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue

@@ -191,14 +191,34 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="备注">
-                <el-input v-model="form.remark" style="width: 250px;" />
+              <el-form-item label="卷类型">
+<!--                <el-input v-model="form.roll_type" style="width: 250px;" />-->
+                <el-select v-model="form.roll_type" placeholder="请选择" style="width: 250px;">
+                  <el-option
+                    v-for="item in roll_type"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="是否重新更新">
-                <el-radio v-model="form.is_reload_send" label="0">否</el-radio>
-                <el-radio v-model="form.is_reload_send" label="1">是</el-radio>
+              <el-form-item label="是否需要烘烤">
+                <el-radio v-model="form.is_baking" label="0">否</el-radio>
+                <el-radio v-model="form.is_baking" label="1">是</el-radio>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-if="form.is_baking === '1'">
+            <el-col :span="12">
+              <el-form-item label="烘烤温度" prop="baking_temperature">
+                <el-input v-model="form.baking_temperature" style="width: 250px;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="烘烤时间" prop="baking_time">
+                <el-input v-model="form.baking_time" style="width: 250px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -223,7 +243,7 @@
         <el-table-column prop="mfg_order_name" label="工单号" :min-width="flexWidth('mfg_order_name',crud.data,'工单号')" />
         <el-table-column prop="status" label="工单状态" :min-width="flexWidth('status',crud.data,'工单状态')" :formatter="formatStatusName" />
         <el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
-        <el-table-column prop="point_code2" label="点位编码" :min-width="flexWidth('point_code2',crud.data,'点位编码')" />
+        <el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
         <el-table-column prop="resource_name" label="机台编码" :min-width="flexWidth('resource_name',crud.data,'机台编码')" />
         <el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品编码')" />
         <el-table-column prop="theory_height" label="理论长度" :min-width="flexWidth('theory_height',crud.data,'理论长度')" />
@@ -233,7 +253,7 @@
         <el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
         <el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
         <el-table-column prop="is_baking" label="请求烘烤" :min-width="flexWidth('is_baking',crud.data,'请求烘烤')" :formatter="formatBakeIsOrNot" />
-        <el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot" />
+<!--        <el-table-column prop="is_instor" label="请求入半成品库" :min-width="flexWidth('is_instor',crud.data,'请求入半成品库')" :formatter="formatStorIsOrNot" />-->
         <el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -273,6 +293,10 @@ const defaultForm = {
   eqp_velocity: null,
   up_coiler_date: null,
   is_reload_send: '0',
+  is_baking: '0',
+  roll_type: null,
+  baking_time: null,
+  baking_temperature: null,
   productin_qty: null,
   realstart_time: null,
   realend_time: null,
@@ -314,6 +338,13 @@ export default {
       dialogShow: false,
       openParam: null,
       permission: {},
+      roll_type: [{
+        value: '1',
+        label: '小卷'
+      }, {
+        value: '2',
+        label: '大卷'
+      }],
       rules: {
         resource_name: [
           { required: true, message: '机台编码不能为空', trigger: 'blur' }
@@ -335,6 +366,12 @@ export default {
         ],
         p_coiler_date: [
           { required: true, message: '上卷开始时间不能为空', trigger: 'blur' }
+        ],
+        baking_temperature: [
+          { required: true, message: '烘烤温度不能为空', trigger: 'blur' }
+        ],
+        baking_time: [
+          { required: true, message: '烘烤时间不能为空', trigger: 'blur' }
         ]
       }
     }

lms2/nladmin-ui/src/views/wms/pdm/order/slittingplan/MaterialDialog.vue

@@ -0,0 +1,194 @@
+<template>
+  <el-dialog
+    title="母卷选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+    >
+      <el-form-item label="母卷号">
+        <el-input
+          v-model="query.container_name"
+          clearable
+          size="mini"
+          placeholder="母卷号"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收卷辊">
+        <el-input
+          v-model="query.material_spec"
+          clearable
+          size="mini"
+          placeholder="收卷辊"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="container_name" label="母卷号" width="160" />
+      <el-table-column prop="resource_name" label="生箔机台" width="160" />
+      <el-table-column prop="mfg_order_name" label="生产工单" width="160" />
+      <el-table-column prop="description" label="产品" width="180" show-overflow-tooltip />
+      <el-table-column prop="productin_qty" label="重量" width="140" />
+      <el-table-column prop="realstart_time" label="开始时间" width="140" />
+      <el-table-column prop="realend_time" label="结束时间" width="140" />
+      <el-table-column prop="status" label="状态" width="140" />
+<!--      <el-table-column v-if="queryInfo === '库存顺序'" prop="total_material_qty" label="物料总数/块" width="140" />-->
+      <el-table-column prop="product_area" label="生产区域" width="130px" />
+      <el-table-column prop="is_baking" label="是否烘烤">
+        <template slot-scope="scop">
+          {{ scop.row.is_baking === '1' ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="wind_roll" label="收卷辊编码" width="135" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'MaterialDialog',
+  components: { rrOperation, pagination },
+  dicts: ['is_used'],
+  cruds() {
+    return CRUD({
+      title: '获取母卷',
+      url: 'api/rawfoilworkorder',
+      optShow: {},
+      query: {
+        is_used: true,
+        statusX: '1'
+      }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    flag: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      tableData: [],
+      queryInfo: '物料顺序',
+      queryFlag: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+
+    },
+    queryMaterials() {
+      this.queryFlag = !this.queryFlag
+      if (this.queryFlag) {
+        this.queryInfo = '库存顺序'
+        this.crud.url = 'api/pdmBdWorkorder/materials'
+        this.crud.toQuery()
+      } else {
+        this.queryInfo = '物料顺序'
+        this.crud.url = 'api/mdBaseMaterial'
+        this.crud.toQuery()
+      }
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.tableRadio, this.flag)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows, this.flag)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+  ::v-deep .el-dialog__body {
+    padding-top: 0px;
+  }
+</style>
+

lms2/nladmin-ui/src/views/wms/pdm/order/slittingplan/RestructDialog.vue

@@ -0,0 +1,202 @@
+<template>
+  <el-dialog
+    title="母卷选择"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="1000px"
+    @close="close"
+    @open="open"
+  >
+    <el-form
+      :inline="true"
+      class="demo-form-inline"
+      label-position="right"
+      label-width="80px"
+    >
+      <el-form-item label="母卷号">
+        <el-input
+          v-model="query.parent_container_name"
+          clearable
+          size="mini"
+          placeholder="母卷号"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="子卷号">
+        <el-input
+          v-model="query.container_name"
+          clearable
+          size="mini"
+          placeholder="子卷号"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <el-form-item label="管芯编码">
+        <el-input
+          v-model="query.vehicle_code"
+          clearable
+          size="mini"
+          placeholder="管芯编码"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-form-item>
+      <rrOperation />
+    </el-form>
+
+    <!--表格渲染-->
+    <el-table
+      ref="table"
+      v-loading="crud.loading"
+      :data="crud.data"
+      style="width: 100%;"
+      size="mini"
+      border
+      :cell-style="{'text-align':'center'}"
+      :header-cell-style="{background:'#f5f7fa',color:'#606266','text-align':'center'}"
+      @select="handleSelectionChange"
+      @select-all="onSelectAll"
+      @current-change="clickChange"
+    >
+      <el-table-column v-if="!isSingle" type="selection" width="55" />
+      <el-table-column v-if="isSingle" label="选择" width="55">
+        <template slot-scope="scope">
+          <el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="parent_container_name" label="母卷号" width="160" />
+      <el-table-column prop="container_name" label="子卷号" width="160" />
+      <el-table-column prop="resource_name" label="分切机台" width="160" />
+      <el-table-column prop="mfg_order_name" label="订单号" width="160" />
+      <el-table-column prop="manufacture_date" label="生产日期" width="160" />
+      <el-table-column prop="paper_tube_or_frp" label="管件类型" />
+      <el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" show-overflow-tooltip />
+      <el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="frp_description" label="FRP管物料描述" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="frp_model" label="FRP管规格" min-width="140" show-overflow-tooltip />
+      <el-table-column prop="start_time" label="开始时间" width="140" />
+      <el-table-column prop="end_time" label="结束时间" width="140" />
+      <el-table-column prop="product_area" label="生产区域" width="130px" />
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import CRUD, { header, presenter } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import pagination from '@crud/Pagination'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  name: 'RestructDialog',
+  components: { rrOperation, pagination },
+  dicts: ['is_used'],
+  cruds() {
+    return CRUD({
+      title: '获取改切卷',
+      url: 'api/slittingproductionplan',
+      optShow: {},
+      query: {
+        is_used: true,
+        statusX: '1'
+      }
+    })
+  },
+  mixins: [presenter(), header()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    isSingle: {
+      type: Boolean,
+      default: true
+    },
+    flag: {
+      type: Number,
+      default: 1
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableRadio: null,
+      tableData: [],
+      queryInfo: '物料顺序',
+      queryFlag: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    clickChange(item) {
+      this.tableRadio = item
+    },
+    open() {
+
+    },
+    queryMaterials() {
+      this.queryFlag = !this.queryFlag
+      if (this.queryFlag) {
+        this.queryInfo = '库存顺序'
+        this.crud.url = 'api/pdmBdWorkorder/materials'
+        this.crud.toQuery()
+      } else {
+        this.queryInfo = '物料顺序'
+        this.crud.url = 'api/mdBaseMaterial'
+        this.crud.toQuery()
+      }
+    },
+    handleSelectionChange(val, row) {
+      if (val.length > 1) {
+        this.$refs.table.clearSelection()
+        this.$refs.table.toggleRowSelection(val.pop())
+      } else {
+        this.checkrow = row
+      }
+    },
+    onSelectAll() {
+      this.$refs.table.clearSelection()
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    },
+    submit() {
+      // 处理单选
+      if (this.isSingle && this.tableRadio) {
+        this.$emit('update:dialogShow', false)
+        this.$emit('tableChanged', this.tableRadio, this.flag)
+        return
+      }
+      this.rows = this.$refs.table.selection
+      if (this.rows.length <= 0) {
+        this.$message('请先勾选物料')
+        return
+      }
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+      this.$emit('tableChanged', this.rows, this.flag)
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .el-dialog__body {
+  padding-top: 0px;
+}
+</style>
+

lms2/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -284,23 +284,36 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="订单类型" prop="order_type">
-                <el-input v-model="form.order_type" style="width: 370px;" />
+                <el-select
+                  v-model="form.order_type"
+                  clearable
+                  disabled
+                  size="mini"
+                  placeholder="请选择"
+                  style="width: 370px"
+                >
+                  <el-option
+                    v-for="item in dict.order_type"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="子卷号" prop="container_name">
-                <el-input v-model="form.container_name" style="width: 370px;" />
+              <el-form-item label="子卷号">
+                <el-input v-model="form.container_name" placeholder="没有则系统生成" style="width: 370px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="产品编码" prop="product_name">
+              <el-form-item label="产品编码">
                 <el-input v-model="form.product_name" style="width: 370px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="产品描述" prop="description">
+              <el-form-item label="产品描述">
                 <el-input v-model="form.description" style="width: 370px;" />
               </el-form-item>
             </el-col>
@@ -308,27 +321,27 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="来源母卷号" prop="parent_container_name">
-                <el-input v-model="form.parent_container_name" style="width: 370px;" />
+                <el-input v-model="form.parent_container_name" style="width: 370px;" @focus="getMaterial" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="改制来源子卷号" prop="restruct_container_name">
-                <el-input v-model="form.restruct_container_name" style="width: 370px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="子卷立库木箱号" prop="package_box_sn">
-                <el-input v-model="form.package_box_sn" style="width: 370px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="来源卷位置" prop="ware_house">
-                <el-input v-model="form.ware_house" style="width: 370px;" />
+                <el-input v-model="form.restruct_container_name" style="width: 370px;" @focus="getMaterial2" />
               </el-form-item>
             </el-col>
           </el-row>
+<!--          <el-row>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="子卷立库木箱号" prop="package_box_sn">-->
+<!--                <el-input v-model="form.package_box_sn" style="width: 370px;" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="来源卷位置" prop="ware_house">-->
+<!--                <el-input v-model="form.ware_house" style="width: 370px;" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <el-row>
             <el-col :span="12">
               <el-form-item label="分切机台编码" prop="resource_name">
@@ -341,6 +354,32 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="上轴/下轴">
+                <el-select v-model="form.up_or_down" placeholder="请选择" style="width: 370px;">
+                  <el-option
+                    v-for="item in is_up_down"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="左卷/右卷">
+                <el-select v-model="form.left_or_right" placeholder="请选择" style="width: 370px;">
+                  <el-option
+                    v-for="item in is_left_right"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="生产顺序" prop="manufacture_sort">
@@ -356,7 +395,12 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="生产日期" prop="manufacture_date">
-                <el-input v-model="form.manufacture_date" style="width: 370px;" />
+                <el-date-picker
+                  v-model="form.manufacture_date"
+                  value-format="yyyy-MM-dd"
+                  style="width: 370px;"
+                  placeholder="选择日期">
+                </el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -372,10 +416,10 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="form.paper_tube_or_FRP === '1'">
             <el-col :span="12">
-              <el-form-item label="纸筒物料编码" prop="paper_tube_material">
-                <el-input v-model="form.paper_tube_material" style="width: 370px;" />
+              <el-form-item label="纸筒规格" prop="paper_tube_model">
+                <el-input v-model="form.paper_tube_model" style="width: 370px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -384,29 +428,17 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="纸筒规格" prop="paper_tube_model">
-                <el-input v-model="form.paper_tube_model" style="width: 370px;" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="FRP管物料编码" prop="FRP_material">
-                <el-input v-model="form.FRP_material" style="width: 370px;" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="FRP管物料描述" prop="FRP_description">
-                <el-input v-model="form.FRP_description" style="width: 370px;" />
-              </el-form-item>
-            </el-col>
+          <el-row v-if="form.paper_tube_or_FRP === '2'">
             <el-col :span="12">
               <el-form-item label="FRP管规格" prop="FRP_model">
                 <el-input v-model="form.FRP_model" style="width: 370px;" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="FRP管物料描述" prop="FRP_description">
+                <el-input v-model="form.FRP_description" style="width: 370px;" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
@@ -427,7 +459,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="销售订单及行号" prop="sale_order_name">
+              <el-form-item label="销售订单及行号">
                 <el-input v-model="form.sale_order_name" style="width: 370px;" />
               </el-form-item>
             </el-col>
@@ -467,7 +499,7 @@
         <el-table-column prop="split_breadth" label="子卷幅宽" :formatter="crud.formatNum3" />
         <el-table-column prop="split_height" label="子卷理论长度" width="100px" :formatter="crud.formatNum3" />
         <el-table-column prop="split_weight" label="子卷理论重量" width="100px" :formatter="crud.formatNum3" />
-        <el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName" />
+        <el-table-column prop="paper_tube_or_FRP" label="管件类型" :formatter="formatTubeName" />
         <el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip />
         <el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" show-overflow-tooltip />
         <el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip />
@@ -493,6 +525,8 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <MaterialDialog :dialog-show.sync="materialDialog" @tableChanged="tableChanged" />
+    <RestructDialog :dialog-show.sync="restructDialog" @tableChanged="tableChanged2" />
   </div>
 </template>
 
@@ -503,6 +537,8 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import MaterialDialog from '@/views/wms/pdm/order/slittingplan/MaterialDialog.vue'
+import RestructDialog from '@/views/wms/pdm/order/slittingplan/RestructDialog.vue'
 
 const defaultForm = {
   workorder_id: null,
@@ -526,6 +562,8 @@ const defaultForm = {
   FRP_material: null,
   FRP_description: null,
   FRP_model: null,
+  up_or_down: null,
+  left_or_right: null,
   split_breadth: null,
   split_height: null,
   split_weight: null,
@@ -552,7 +590,7 @@ const defaultForm = {
 export default {
   name: 'Slittingproductionplan',
   dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { RestructDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -573,6 +611,22 @@ export default {
   data() {
     return {
       permission: {},
+      materialDialog: false,
+      restructDialog: false,
+      is_up_down: [{
+        value: '1',
+        label: '上轴'
+      }, {
+        value: '2',
+        label: '下轴'
+      }],
+      is_left_right: [{
+        value: '1',
+        label: '左卷'
+      }, {
+        value: '2',
+        label: '右卷'
+      }],
       rules: {
         order_type: [
           { required: true, message: '分切订单类型不能为空', trigger: 'blur' }
@@ -612,6 +666,22 @@ export default {
     hand() {
       this.crud.toQuery()
     },
+    getMaterial() {
+      this.materialDialog = true
+    },
+    getMaterial2() {
+      this.restructDialog = true
+    },
+    tableChanged(row) {
+      this.form.parent_container_name = row.container_name
+      this.form.order_type = '1'
+      this.form.restruct_container_name = ''
+    },
+    tableChanged2(row) {
+      this.form.restruct_container_name = row.container_name
+      this.form.order_type = '2'
+      this.form.parent_container_name = ''
+    },
     upMaterFinish() {
       const _selectData = this.$refs.table.selection
       const data = {
@@ -672,7 +742,7 @@ export default {
       return this.dict.label.ware_house[row.ware_house]
     },
     formatTubeName(row) {
-      return this.dict.label.paper_tube_or_frp[row.paper_tube_or_frp]
+      return this.dict.label.paper_tube_or_frp[row.paper_tube_or_FRP]
     },
     formatParentName(row) {
       return this.dict.label.IS_OR_NOT[row.is_parent_ok]