小料

mes/qd/src/views/wms/pf/acceptformula/AddDialog.vue

@@ -1,20 +1,22 @@
 <template>
   <el-dialog
     style="padding-top: 0px;"
-    :title="crud.status.title"
+    title="小线试验维护"
+    v-loading.fullscreen.lock="fullscreenLoading"
+    :visible.sync="dialogVisible"
     append-to-body
     fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
+    @close="close"
+    @open="open"
   >
-    <el-row v-show="crud.status.cu > 0" :gutter="20">
+    <el-row  :gutter="20">
       <el-col :span="20" style="border: 1px solid white">
         <span />
       </el-col>
       <el-col :span="4">
         <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
+          <el-button icon="el-icon-check" size="mini"  type="primary" @click="mysubmitCU">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="dialogVisible = false">关闭</el-button>
         </span>
       </el-col>
     </el-row>
@@ -29,7 +31,6 @@
           placeholder="物料"
           style="width: 210px"
           class="filter-item"
-          :disabled="crud.status.view > 0"
           @change="storChange"
         >
           <el-option
@@ -43,7 +44,7 @@
       <el-form-item label="批号" prop="inspection_id">
         <el-select
           v-model="form.inspection_id"
-          clearable
+          style="width: 210px"
           size="mini"
           placeholder="批号"
           class="filter-item"
@@ -138,8 +139,7 @@
           style="width: 210px"
         />
       </el-form-item>
-    </el-form>
-    <el-form ref="form2" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="150px" label-suffix=":">
+      <el-divider></el-divider>
       <el-form-item label="验收牌号" prop="mark_id">
         <el-select
           v-model="form.mark_id"
@@ -231,10 +231,10 @@
         />
       </el-form-item>
       <el-form-item label="开单人" align="center">
-        <el-input v-model="form.create_name" placeholder="开单人" style="width: 210px" disabled />
+        <el-input v-model="form.create_name"  style="width: 210px" disabled />
       </el-form-item>
       <el-form-item label="开单日期" align="center">
-        <el-input v-model="form.create_time" placeholder="开单人" style="width: 210px" disabled />
+        <el-input v-model="form.create_time" style="width: 210px" disabled />
       </el-form-item>
     </el-form>
     <div class="crud-opts2" style="margin-bottom: 5px;">
@@ -247,7 +247,7 @@
           type="primary"
           icon="el-icon-plus"
           size="mini"
-          @click="insertdtl"
+          @click="autoCalculation"
         >
           开单计算
         </el-button>
@@ -255,7 +255,7 @@
     </div>
     <el-table
       ref="table"
-      :data="form.tableData"
+      :data="tableData"
       style="width: 100%;"
       size="mini"
       border
@@ -271,15 +271,14 @@
             size="mini"
             :controls="false"
             :precision="4"
-            :max="100"
             :min="0"
-            :disabled="scope.row.edit"
+            :disabled="scope.row.is_thw"
           />
         </template>
       </el-table-column>
       <el-table-column prop="dtl_pcsn" label="批次" align="center">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.dtl_pcsn" placeholder="批次" />
+          <el-input v-model="scope.row.dtl_pcsn" placeholder="批次"  :disabled="scope.row.is_thw" />
         </template>
       </el-table-column>
     </el-table>
@@ -293,6 +292,7 @@ import Date from '@/utils/datetime'
 const defaultForm = {
   formula_code: '',
   material_id: '',
+  manufactor: '',
   inspection_id: '',
   CJZB00001: 0,
   CJZB00002: 0,
@@ -318,6 +318,7 @@ const defaultForm = {
 
 import crudacceptformula from '@/api/wms/pf/acceptformula'
 import CRUD, { form, crud } from '@crud/crud'
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'AddDialog',
@@ -327,6 +328,9 @@ export default {
     dialogShow: {
       type: Boolean,
       default: false
+    },
+    rowmst: {
+      type: Object
     }
   },
   data() {
@@ -338,6 +342,8 @@ export default {
       boms: [],
       THWs: [],
       PCSNs: [],
+      tableData: [],
+      fullscreenLoading: false,
       rules: {
         material_id: [
           { required: true, message: '物料不能为空', trigger: 'blur' }
@@ -362,8 +368,18 @@ export default {
       handler(newValue, oldValue) {
         this.dialogVisible = newValue
       }
+    },
+    rowmst: {
+      handler(newValue) {
+        this.form = newValue
+      }
     }
   },
+  computed: {
+    ...mapGetters({
+      user: 'user'
+    })
+  },
   created() {
     crudacceptformula.getBoms().then(res => {
       this.boms = res
@@ -371,9 +387,18 @@ export default {
     crudacceptformula.getTHWs().then(res => {
       this.THWs = res
     })
+    this.tableData = []
   },
   methods: {
-    [CRUD.HOOK.beforeSubmit]() {
+    mysubmitCU() {
+      if (!this.form.material_id) {
+        this.crud.notify('物料不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
+      if (!this.form.inspection_id) {
+        this.crud.notify('批号不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+        return false
+      }
       if (!this.form.mark_id) {
         this.crud.notify('验收牌号不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
@@ -383,19 +408,71 @@ export default {
         return false
       }
       if (this.form.accept_qty <= 0) {
-        this.crud.notify('试验重量不能为0！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.crud.notify('试验重量不能为0或空！', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
-      if (this.form.tableData.length === 0) {
+      if (this.tableData.length === 0) {
         this.crud.notify('开单明细不能为空', CRUD.NOTIFICATION_TYPE.INFO)
         return false
       }
+      for (let i = 0; i < this.tableData.length; i++) {
+        if (!this.tableData[i].dtl_pcsn) {
+          this.crud.notify('批次不能为空，明细序号为' + (i + 1) + '请检查！')
+          return false
+        }
+        if (this.tableData[i].formula_qty <= 0) {
+          this.crud.notify('明细重量不能为0或空，明细序号为' + (i + 1) + '请检查！')
+          return false
+        }
+      }
+      this.form.tableData = this.tableData
+
+      if (!this.form.formula_id) {
+        crudacceptformula.create(this.form).then(res => {
+          this.$refs['form'].resetFields()
+          this.tableData = []
+          this.$emit('AddChanged')
+          this.$emit('update:dialogShow', false)
+        })
+      } else {
+        crudacceptformula.update(this.form).then(res => {
+          this.$refs['form'].resetFields()
+          this.tableData = []
+          this.$emit('AddChanged')
+          this.$emit('update:dialogShow', false)
+        })
+      }
     },
-    [CRUD.HOOK.afterToEdit]() {
-      // 编辑之后获取明细
-      crudacceptformula.getDtl({ 'mark_id': this.form.mark_id }).then(res => {
-        this.form.tableData = res
-      })
+    open() {
+      if (this.form.formula_id) {
+        // 编辑之后获取明细
+        crudacceptformula.getDtl({ 'formula_id': this.form.formula_id }).then(res => {
+          this.tableData = res
+        })
+        crudacceptformula.getPCSNs({ 'material_id': this.form.material_id }).then(res => {
+          this.PCSNs = res
+        })
+        crudacceptformula.getPCSNid(this.form).then(res => {
+          this.form.inspection_id = res.inspection_id
+          this.form.CJZB00007 = res.CJZB00007
+          this.form.CJZB00001 = res.CJZB00001
+          this.form.CJZB00002 = res.CJZB00002
+          this.form.CJZB00006 = res.CJZB00006
+          this.form.CJZB00021 = res.CJZB00021
+          this.form.CJZB00020 = res.CJZB00020
+          this.form.CJZB00004 = res.CJZB00004
+          this.form.manufactor = res.manufactor
+        })
+        crudacceptformula.getBom({ 'mark_id': this.form.mark_id }).then(res => {
+          this.form.c_balance = res.c_balance
+          this.form.ball_rate = res.ball_rate
+          this.form.liquid_rate = res.liquid_rate
+          this.form.ball_time = res.ball_time
+          this.form.ball_speed = res.ball_speed
+          this.form.ball_qty = this.form.ball_rate * this.form.accept_qty / 100.0
+          this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty / 100.0
+        })
+      }
     },
     storChange(row) {
       crudacceptformula.getPCSNs({ 'material_id': row }).then(res => {
@@ -419,6 +496,7 @@ export default {
         this.form.CJZB00021 = res.CJZB00021
         this.form.CJZB00020 = res.CJZB00020
         this.form.CJZB00004 = res.CJZB00004
+        this.form.manufactor = res.manufactor
       })
     },
     storChange3(row) {
@@ -445,30 +523,25 @@ export default {
         })
     },
     close() {
+      this.$refs['form'].resetFields()
+      this.tableData = []
+      this.$emit('AddChanged')
       this.$emit('update:dialogShow', false)
     },
-    handleEdit(index, row) {
-      // 判断是否可以关闭编辑状态
-      if (!row.edit) {
-        if (parseFloat(row.standard_rate) <= 0) {
-          this.crud.notify('标准值必须大于0！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.material_code) {
-          this.crud.notify('物料不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-      }
-      row.edit = !row.edit
-      this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
-    },
-    insertdtl() {
-      this.form.tableData.push({ material_id: '', material_code: '', material_name: '', standard_rate: '0', seqno: '', edit: false })
-    },
     createPcsn() {
       crudacceptformula.createPcsn().then(res => {
         this.form.accept_pcsn = res.accept_pcsn
       })
+    },
+    autoCalculation() {
+      this.fullscreenLoading = true
+      crudacceptformula.autoCalculation(this.form).then(res => {
+        this.crud.notify('自动计算成功！')
+        this.tableData = res
+        this.fullscreenLoading = false
+      }).catch(() => {
+        this.fullscreenLoading = false
+      })
     }
   }
 }

mes/qd/src/views/wms/pf/acceptformula/AddDialog2.vue

@@ -1,343 +0,0 @@
-<template>
-  <el-dialog
-    style="padding-top: 0px;"
-    :title="crud.status.title"
-    append-to-body
-    fullscreen
-    :before-close="crud.cancelCU"
-    :visible.sync="crud.status.cu > 0 || crud.status.view > 0"
-  >
-    <el-row v-show="crud.status.cu > 0" :gutter="20">
-      <el-col :span="20" style="border: 1px solid white">
-        <span />
-      </el-col>
-      <el-col :span="4">
-        <span>
-          <el-button icon="el-icon-check" size="mini" :loading="crud.cu === 2" type="primary" @click="crud.submitCU">保存</el-button>
-          <el-button icon="el-icon-close" size="mini" type="info" @click="crud.cancelCU">关闭</el-button>
-        </span>
-      </el-col>
-    </el-row>
-
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="150px" label-suffix=":">
-      <el-form-item label="实验序号" prop="formula_code">
-        <el-input v-model="form.formula_code" placeholder="系统生成" style="width: 210px" disabled>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="物料" prop="material_id">
-        <el-select
-          v-model="form.material_id"
-          placeholder="物料"
-          style="width: 210px"
-          class="filter-item"
-          :disabled="crud.status.view > 0"
-        >
-          <el-option
-            v-for="item in THWs"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="批号"  prop="inspection_id">
-        <el-select
-          v-model="form.inspection_id"
-          clearable
-          size="mini"
-          placeholder="批号"
-          class="filter-item"
-        >
-          <el-option
-            v-for="item in PCSNs"
-            :key="item.id"
-            :label="item.code"
-            :value="item.id"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="生产厂家" prop="manufactor">
-        <el-input v-model="form.manufactor" placeholder="生产厂家" style="width: 210px" disabled>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="CT(%)" prop="c_balance">
-        <label slot="label">CT(%):</label>
-        <el-input-number
-          v-model="form.c_balance"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="Cr3C2" prop="c_balance">
-        <label slot="label">Cr3C2:</label>
-        <el-input-number
-          v-model="form.liquid_rate"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="氧含量" prop="c_balance">
-        <label slot="label">氧含量:</label>
-        <el-input-number
-          v-model="form.ball_rate"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-
-      <el-form-item label="VC(%)" prop="c_balance">
-        <label slot="label">VC(%):</label>
-        <el-input-number
-          v-model="form.ball_speed"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="CF(%)" prop="c_balance">
-        <label slot="label">CF(%):</label>
-        <el-input-number
-          v-model="form.ball_time"
-          :controls="false"
-          :precision="0"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="FSSS(μm)">
-        <label slot="label">FSSS(μm):</label>
-        <el-input-number
-          v-model="form.total_value"
-          :controls="false"
-          :precision="4"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="BET(㎡/g)">
-        <label slot="label">BET(㎡/g):</label>
-        <el-input-number
-          v-model="form.total_value2"
-          :controls="false"
-          :precision="4"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="明细数">
-        <el-input v-model="form.tableData.length" :disabled="true" style="width: 210px;" />
-      </el-form-item>
-
-      <el-form-item label="备注" prop="remark">
-        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-      </el-form-item>
-    </el-form>
-
-    <div class="crud-opts2" style="margin-bottom: 5px;">
-      <span class="crud-opts-right2">
-        <!--左侧插槽-->
-        <slot name="left" />
-        <el-button
-          slot="left"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="insertdtl"
-        >
-          开单计算
-        </el-button>
-      </span>
-    </div>
-    <el-table
-      ref="table"
-      :data="form.tableData"
-      style="width: 100%;"
-      size="mini"
-      border
-      :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
-    >
-      <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column prop="material_code" label="物料编码" align="center" />
-      <el-table-column prop="material_name" label="物料名称" align="center" />
-      <el-table-column prop="standard_rate" label="标准值%" align="center">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="scope.row.standard_rate"
-            size="mini"
-            :controls="false"
-            :precision="4"
-            :max="100"
-            :min="0"
-            :disabled="scope.row.edit"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="seqno" label="顺序号" align="center" />
-    </el-table>
-  </el-dialog>
-</template>
-
-<script>
-
-const defaultForm = {
-  formula_code: '',
-  material_id: '',
-  inspection_id: '',
-  c_balance: 0,
-  liquid_rate: 0,
-  ball_rate: 0,
-  ball_speed: 0,
-  ball_time: 0,
-  detail_count: 0,
-  manufactor: '',
-  total_value: 0,
-  total_value2: 0,
-  remark: '',
-  tableData: []
-}
-
-import crudacceptformula from '@/api/wms/pf/acceptformula'
-import CRUD, { form, crud } from '@crud/crud'
-
-export default {
-  name: 'AddDialog',
-  components: {},
-  mixins: [crud(), form(defaultForm)],
-  props: {
-    dialogShow: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      dialogVisible: false,
-      dtlMaterShow: false,
-      nowrow: {},
-      boms: [],
-      THWs: [],
-      PCSNs: [],
-      nowindex: '',
-      rules: {
-        material_id: [
-          { required: true, message: '牌号不能为空', trigger: 'blur' }
-        ],
-        inspection_id: [
-          { required: true, message: '批次不能为空', trigger: 'blur' }
-        ],
-        c_balance: [
-          { required: true, message: '碳平衡不能为空', trigger: 'blur' }
-        ],
-        liquid_rate: [
-          { required: true, message: '液料比不能为空', trigger: 'blur' }
-        ],
-        ball_rate: [
-          { required: true, message: '球料比不能为空', trigger: 'blur' }
-        ],
-        ball_speed: [
-          { required: true, message: '球磨转速不能为空', trigger: 'blur' }
-        ],
-        ball_time: [
-          { required: true, message: '研磨时间不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    dialogShow: {
-      handler(newValue, oldValue) {
-        this.dialogVisible = newValue
-      }
-    }
-  },
-  created() {
-    crudacceptformula.getBoms().then(res => {
-      this.boms = res
-    })
-    crudacceptformula.getTHWs().then(res => {
-      this.THWs = res
-    })
-    crudacceptformula.getPCSNs().then(res => {
-      this.PCSNs = res
-    })
-  },
-  methods: {
-    [CRUD.HOOK.beforeSubmit]() {
-      if (this.form.tableData.length === 0) {
-        this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
-        return false
-      }
-    },
-    [CRUD.HOOK.afterToEdit]() {
-      // 编辑之后获取明细
-      crudacceptformula.getDtl({ 'mark_id': this.form.mark_id }).then(res => {
-        this.form.tableData = res
-      })
-    },
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done()
-        })
-        .catch(_ => {
-        })
-    },
-    close() {
-      this.$emit('update:dialogShow', false)
-    },
-    handleEdit(index, row) {
-      // 判断是否可以关闭编辑状态
-      if (!row.edit) {
-        if (parseFloat(row.standard_rate) <= 0) {
-          this.crud.notify('标准值必须大于0！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-        if (!row.material_code) {
-          this.crud.notify('物料不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
-          return false
-        }
-      }
-      row.edit = !row.edit
-      this.form.tableData.splice(index, 1, row) // 通过splice 替换数据 触发视图更新
-    },
-    insertdtl() {
-    }
-  }
-}
-</script>
-
-<style scoped>
-.crud-opts2 {
-  padding: 4px 0;
-  display: -webkit-flex;
-  display: flex;
-  align-items: center;
-}
-
-.crud-opts2 .crud-opts-right2 {
-  margin-left: auto;
-}
-
-</style>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-::v-deep .el-dialog__body {
-  padding-top: 0px;
-}
-</style>

mes/qd/src/views/wms/pf/acceptformula/ViewDialog.vue

@@ -1,16 +1,164 @@
 <template>
   <el-dialog
     style="padding-top: 0px;"
-    title="小线实验牌号详情"
+    title="碳化钨小线验收试验"
     :visible.sync="dialogVisible"
     append-to-body
     fullscreen
     @open="open"
     @close="close"
   >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="150px" label-suffix=":">
-      <el-form-item label="牌号" prop="mark_code">
-        <el-input v-model="form.mark_code" placeholder="牌号" style="width: 210px" disabled />
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form"  size="mini" label-width="150px" label-suffix=":">
+      <el-form-item label="实验序号" prop="formula_code">
+        <el-input v-model="form.formula_code" placeholder="系统生成" style="width: 210px" disabled />
+      </el-form-item>
+      <el-form-item label="物料" prop="material_id">
+        <el-select
+          v-model="form.material_id"
+          placeholder="物料"
+          style="width: 210px"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in THWs"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="批号" prop="inspection_id">
+        <el-select
+          v-model="form.inspection_id"
+          style="width: 210px"
+          size="mini"
+          placeholder="批号"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in PCSNs"
+            :key="item.id"
+            :label="item.code"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="生产厂家" prop="manufactor">
+        <el-input v-model="form.manufactor" placeholder="生产厂家" style="width: 210px" disabled />
+      </el-form-item>
+      <el-form-item label="CT(%)" prop="CJZB00004">
+        <label slot="label">CT(%):</label>
+        <el-input-number
+          v-model="form.CJZB00004"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="Cr3C2" prop="CJZB00021">
+        <label slot="label">Cr3C2:</label>
+        <el-input-number
+          v-model="form.CJZB00021"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="氧含量" prop="CJZB00007">
+        <label slot="label">氧含量:</label>
+        <el-input-number
+          v-model="form.CJZB00007"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+
+      <el-form-item label="VC(%)" prop="CJZB00020">
+        <label slot="label">VC(%):</label>
+        <el-input-number
+          v-model="form.CJZB00020"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="CF(%)" prop="CJZB00006">
+        <label slot="label">CF(%):</label>
+        <el-input-number
+          v-model="form.CJZB00006"
+          :controls="false"
+          :precision="0"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="FSSS(μm)" prop="CJZB00001">
+        <label slot="label">FSSS(μm):</label>
+        <el-input-number
+          v-model="form.CJZB00001"
+          :controls="false"
+          :precision="4"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+      <el-form-item label="BET(㎡/g)" prop="CJZB00002">
+        <label slot="label">BET(㎡/g):</label>
+        <el-input-number
+          v-model="form.CJZB00002"
+          :controls="false"
+          :precision="4"
+          :min="0"
+          disabled
+          style="width: 210px"
+        />
+      </el-form-item>
+    </el-form>
+    <el-form ref="form2" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="150px" label-suffix=":">
+      <el-form-item label="验收牌号" prop="mark_id">
+        <el-select
+          v-model="form.mark_id"
+          placeholder="验收牌号"
+          style="width: 210px"
+          class="filter-item"
+          disabled
+        >
+          <el-option
+            v-for="item in boms"
+            :key="item.id"
+            :label="item.code"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="试验批号" prop="accept_pcsn">
+        <label slot="label">试验批号:</label>
+        <el-input v-model="form.accept_pcsn" style="width: 210px" disabled >
+        </el-input>
+      </el-form-item>
+      <el-form-item label="试验重量(g)" prop="accept_qty">
+        <label slot="label">试验重量(g):</label>
+        <el-input-number
+          v-model="form.accept_qty"
+          :controls="false"
+          :precision="3"
+          :min="0"
+          style="width: 210px"
+          disabled
+        />
       </el-form-item>
       <el-form-item label="碳平衡" prop="c_balance">
         <label slot="label">碳平衡:</label>
@@ -23,21 +171,10 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="液料比" prop="c_balance">
-        <label slot="label">液料比:</label>
+      <el-form-item label="溶剂量(ml)" prop="liquid_qty">
+        <label slot="label">溶剂量(ml):</label>
         <el-input-number
-          v-model="form.liquid_rate"
-          :controls="false"
-          :precision="3"
-          :min="0"
-          disabled
-          style="width: 210px"
-        />
-      </el-form-item>
-      <el-form-item label="球料比" prop="c_balance">
-        <label slot="label">球料比:</label>
-        <el-input-number
-          v-model="form.ball_rate"
+          v-model="form.liquid_qty"
           :controls="false"
           :precision="3"
           :min="0"
@@ -46,10 +183,10 @@
         />
       </el-form-item>
 
-      <el-form-item label="球磨转速(RPM)" prop="c_balance">
-        <label slot="label">球磨转速(RPM):</label>
+      <el-form-item label="合金球(KG)" prop="ball_qty">
+        <label slot="label">合金球(KG):</label>
         <el-input-number
-          v-model="form.ball_speed"
+          v-model="form.ball_qty"
           :controls="false"
           :precision="3"
           :min="0"
@@ -57,10 +194,10 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="研磨时间(H)" prop="c_balance">
-        <label slot="label">研磨时间(H):</label>
+      <el-form-item label="球磨转速(RPM)" prop="ball_speed">
+        <label slot="label">球磨转速(RPM):</label>
         <el-input-number
-          v-model="form.ball_time"
+          v-model="form.ball_speed"
           :controls="false"
           :precision="0"
           :min="0"
@@ -68,10 +205,10 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="标准值合计(%)">
-        <label slot="label">标准值合计(%):</label>
+      <el-form-item label="研磨时间(H)" prop="ball_time">
+        <label slot="label">研磨时间(H):</label>
         <el-input-number
-          v-model="form.total_value"
+          v-model="form.ball_time"
           :controls="false"
           :precision="4"
           :min="0"
@@ -79,16 +216,13 @@
           style="width: 210px"
         />
       </el-form-item>
-      <el-form-item label="明细数">
-        <el-input v-model="tableData.length" disabled style="width: 210px;" />
+      <el-form-item label="开单人" align="center">
+        <el-input v-model="form.create_name"  style="width: 210px" disabled />
       </el-form-item>
-
-      <el-form-item label="备注" prop="remark">
-        <label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
-        <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" disabled />
+      <el-form-item label="开单日期" align="center">
+        <el-input v-model="form.create_time" style="width: 210px" disabled />
       </el-form-item>
     </el-form>
-
     <el-table
       ref="table"
       :data="tableData"
@@ -100,33 +234,65 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="material_code" label="物料编码" align="center" />
       <el-table-column prop="material_name" label="物料名称" align="center" />
-      <el-table-column prop="standard_rate" label="标准值%" align="center">
+      <el-table-column prop="formula_qty" label="重量" align="center">
         <template slot-scope="scope">
           <el-input-number
-            v-model="scope.row.standard_rate"
+            v-model="scope.row.formula_qty"
             size="mini"
             :controls="false"
             :precision="4"
-            :max="100"
             :min="0"
             disabled
           />
         </template>
       </el-table-column>
-      <el-table-column prop="seqno" label="顺序号" align="center" />
+      <el-table-column prop="dtl_pcsn" label="批次" align="center">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.dtl_pcsn" placeholder="批次"  disabled />
+        </template>
+      </el-table-column>
     </el-table>
   </el-dialog>
 </template>
 
 <script>
 
-import { crud } from '@crud/crud'
-import crudacceptmark from '@/api/wms/pf/acceptmark'
+import Date from '@/utils/datetime'
+import crudacceptformula from '@/api/wms/pf/acceptformula'
+import CRUD, { form, crud } from '@crud/crud'
+
+const defaultForm = {
+  formula_code: '',
+  material_id: '',
+  manufactor: '',
+  inspection_id: '',
+  CJZB00001: 0,
+  CJZB00002: 0,
+  CJZB00006: 0,
+  CJZB00020: 0,
+  CJZB00021: 0,
+  CJZB00004: 0,
+  CJZB00007: 0,
+  mark_id: '',
+  create_name: '',
+  create_time: (new Date()).strftime('%F', 'zh'),
+  accept_pcsn: '',
+  accept_qty: 1000,
+  c_balance: 0,
+  ball_rate: 0,
+  liquid_rate: 0,
+  ball_qty: 0,
+  liquid_qty: 0,
+  ball_time: 0,
+  ball_speed: 0,
+  tableData: []
+}
+
 
 export default {
   name: 'ViewDialog',
   components: {},
-  mixins: [crud()],
+  mixins: [crud(), form(defaultForm)],
   props: {
     dialogShow: {
       type: Boolean,
@@ -140,6 +306,9 @@ export default {
     return {
       dialogVisible: false,
       form: {},
+      boms: [],
+      THWs: [],
+      PCSNs: [],
       tableData: []
     }
   },
@@ -155,20 +324,42 @@ export default {
       }
     }
   },
+  created() {
+    crudacceptformula.getBoms().then(res => {
+      this.boms = res
+    })
+    crudacceptformula.getTHWs().then(res => {
+      this.THWs = res
+    })
+  },
   methods: {
     open() {
       // 编辑之后获取明细
-      crudacceptmark.getDtl({ 'mark_id': this.form.mark_id }).then(res => {
+      crudacceptformula.getDtl({ 'formula_id': this.form.formula_id }).then(res => {
         this.tableData = res
-        // 计算合计值
-        let all = 0
-        for (let i = 0; i < this.tableData.length; i++) {
-          const row = this.tableData[i]
-          row.edit = true
-          this.tableData.splice(i, 1, row)
-          all = all + parseFloat(row.standard_rate)
-        }
-        this.form.total_value = all
+      })
+      crudacceptformula.getPCSNs({ 'material_id': this.form.material_id }).then(res => {
+        this.PCSNs = res
+      })
+      crudacceptformula.getPCSNid(this.form).then(res => {
+        this.form.inspection_id = res.inspection_id
+        this.form.CJZB00007 = res.CJZB00007
+        this.form.CJZB00001 = res.CJZB00001
+        this.form.CJZB00002 = res.CJZB00002
+        this.form.CJZB00006 = res.CJZB00006
+        this.form.CJZB00021 = res.CJZB00021
+        this.form.CJZB00020 = res.CJZB00020
+        this.form.CJZB00004 = res.CJZB00004
+        this.form.manufactor = res.manufactor
+      })
+      crudacceptformula.getBom({ 'mark_id': this.form.mark_id }).then(res => {
+        this.form.c_balance = res.c_balance
+        this.form.ball_rate = res.ball_rate
+        this.form.liquid_rate = res.liquid_rate
+        this.form.ball_time = res.ball_time
+        this.form.ball_speed = res.ball_speed
+        this.form.ball_qty = this.form.ball_rate * this.form.accept_qty / 100.0
+        this.form.liquid_qty = this.form.liquid_rate * this.form.accept_qty / 100.0
       })
     },
     close() {

mes/qd/src/views/wms/pf/acceptformula/index.vue

@@ -82,6 +82,16 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          @click="typeChange"
+        >
+          新增
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -95,12 +105,10 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="45" />
-        <el-table-column v-permission="[]" label="操作" fixed="right" width="120px" align="center">
+        <el-table-column v-permission="[]" label="操作" fixed="right" width="160px" align="center">
           <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-            />
+            <el-button  type="text"   size="mini" icon="el-icon-edit" @click="mytoEdit(scope.row)">修改</el-button>
+            <el-button  type="text"   size="mini" icon="el-icon-delete" @click="mytodelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="formula_code" width="120px" label="实验序号" align="center">
@@ -113,7 +121,6 @@
         <el-table-column prop="material_pcsn" label="碳化钨批次" width="120px" align="center" />
         <el-table-column prop="mark_code" label="验收牌号" width="120px" align="center" />
         <el-table-column prop="accept_pcsn" label="试验批号" width="120px" align="center" />
-        <el-table-column prop="detail_count" label="明细数" align="center" min-width="60" />
         <el-table-column prop="accept_qty" label="重量" align="center" min-width="80" :formatter="crud.formatNum3" />
         <el-table-column prop="confirm_qty" label="开单重量" align="center" min-width="80" :formatter="crud.formatNum3" />
         <el-table-column prop="remark" label="备注" align="center" min-width="135" />
@@ -125,7 +132,7 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <AddDialog />
+    <AddDialog :dialog-show.sync="newShow" :rowmst="mstrow"  @AddChanged="querytable"/>
     <ViewDialog :dialog-show.sync="viewShow" :rowmst="mstrow" @AddChanged="querytable" />
   </div>
 </template>
@@ -153,7 +160,7 @@ export default {
       sort: 'create_time desc',
       crudMethod: { ...crudacceptformula },
       optShow: {
-        add: true,
+        add: false,
         del: false,
         edit: false,
         reset: true
@@ -167,6 +174,7 @@ export default {
       mstrow: {},
       boms: [],
       viewShow: false,
+      newShow: false,
       query_flag: true,
       rules: {
       }}
@@ -195,6 +203,20 @@ export default {
       this.mstrow = row
       this.viewShow = true
     },
+    typeChange() {
+      this.newShow = true
+    },
+    mytoEdit(row) {
+      this.mstrow = row
+      this.newShow = true
+    },
+    mytodelete(row) {
+      debugger
+      crudacceptformula.mydel(row).then(res => {
+        this.crud.toQuery()
+        this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+      })
+    },
     mytoQuery(array1) {
       if (array1 === null) {
         this.crud.query.begin_time = ''