modified: src/views/basic/param/index.vue modified: src/views/basic/p...

Fixiaobai

2023-11-07 f6afb0b97096e7c0d60226c6de4c29505942f129

	modified:   src/views/basic/param/index.vue
	modified:   src/views/basic/param/param-form.vue
	modified:   src/views/technology/completeproductstructure/completeproductstructure-form.vue
	modified:   src/views/technology/structure/single-structure-form.vue

 src/views/basic/param/index.vue

@@ -5,12 +5,12 @@
          <el-row>
            <el-col :span="4">
              <el-form-item label="参数项:">
                <el-input clearable style="width:200px" v-model="searchForm.param" placeholder="参数项"></el-input>
                <el-input clearable style="width: 100%;" v-model="searchForm.param" placeholder="参数项"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="4">
            <el-col :span="5">
              <el-form-item label="参数编号:">
                <el-input clearable style="width:200px" v-model="searchForm.code" placeholder="参数编号"></el-input>
                <el-input clearable style="width: 100%;" v-model="searchForm.code" placeholder="参数编号"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">

 src/views/basic/param/param-form.vue

@@ -19,7 +19,7 @@
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="参数类型" prop="type">
      <!-- <el-form-item label="参数类型" prop="type">
        <el-select
          v-model="dataForm.type"
          filterable
@@ -64,7 +64,7 @@
      </el-form-item>
      <el-form-item label="单位" prop="unit">
        <el-input v-model="dataForm.unit" placeholder="单位"></el-input>
      </el-form-item>
      </el-form-item> -->
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>

 src/views/technology/completeproductstructure/completeproductstructure-form.vue

@@ -74,7 +74,7 @@
                >
                </el-input>
              </el-form-item>

<!-- 
              <el-form-item label="替代号" prop="alternativeNo">
                <el-input
                  v-model="treeForm.alternativeNo"
@@ -110,7 +110,7 @@
                  placeholder="特性1"
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->
            </el-col>
          </el-row>
        </el-form>
@@ -151,10 +151,98 @@
            </el-table-column>
            <el-table-column prop="unit" label="单位" width="100">
            </el-table-column>
            <el-table-column prop="discNum" label="盘数(盘)" width="100">
            </el-table-column>
            <el-table-column prop="operationName" label="消耗工序">
            </el-table-column>
          <el-table-column label="磨具编号" prop="sharpenerNo" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.sharpenerNo" placeholder="请填写磨具编号"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.sharpenerNo
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="每模穴数" prop="caveNum" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.caveNum" placeholder="请填写每模穴数"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.caveNum
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="克重(kg)" prop="gramWeight" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.gramWeight" placeholder="请填写克重"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.gramWeight
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="浇口克重(kg)" prop="gateGramWeight" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.gateGramWeight" placeholder="请填写浇口克重"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.gateGramWeight
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="成型周期(h)" prop="moldingCycle" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.moldingCycle" placeholder="请填写成型周期"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.moldingCycle
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="机台(t)" prop="machine" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.machine" placeholder="请填写机台"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.machine
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="回料比例(%)" prop="scale" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.scale" placeholder="请填写回料比例"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.scale
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="烘料时间(h)" prop="dryingTime" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.dryingTime" placeholder="请填写烘料时间"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.dryingTime
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="烘料温度(℃)" prop="dryingTemperature" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.dryingTemperature" placeholder="请填写烘料温度"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.dryingTemperature
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="包装信息" prop="packingInfo" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.packingInfo" placeholder="请填写包装信息"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.packingInfo
                  }}</span>
                </template>
              </el-table-column>
          </el-table>
        </div>
        <div class="completeProductStructure-queryPreview"></div>
@@ -192,13 +280,103 @@
            </el-table-column>
            <el-table-column prop="unit" label="单位" width="100">
            </el-table-column>
            <el-table-column prop="discNum" label="盘数(盘)" width="100">
            <!-- <el-table-column prop="discNum" label="盘数(盘)" width="100">
              <template slot-scope="scope">
                {{ scope.row.discNum || 1 }}
              </template>
            </el-table-column>
            </el-table-column> -->
            <el-table-column prop="operationName" label="消耗工序">
            </el-table-column>
            <el-table-column label="磨具编号" prop="sharpenerNo" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.sharpenerNo" placeholder="请填写磨具编号"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.sharpenerNo
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="每模穴数" prop="caveNum" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.caveNum" placeholder="请填写每模穴数"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.caveNum
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="克重(kg)" prop="gramWeight" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.gramWeight" placeholder="请填写克重"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.gramWeight
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="浇口克重(kg)" prop="gateGramWeight" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.gateGramWeight" placeholder="请填写浇口克重"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.gateGramWeight
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="成型周期(h)" prop="moldingCycle" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.moldingCycle" placeholder="请填写成型周期"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.moldingCycle
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="机台(t)" prop="machine" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.machine" placeholder="请填写机台"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.machine
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="回料比例(%)" prop="scale" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.scale" placeholder="请填写回料比例"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.scale
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="烘料时间(h)" prop="dryingTime" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.dryingTime" placeholder="请填写烘料时间"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.dryingTime
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="烘料温度(℃)" prop="dryingTemperature" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.dryingTemperature" placeholder="请填写烘料温度"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.dryingTemperature
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="包装信息" prop="packingInfo" align="center">
                <template slot-scope="scope">
                  <el-input size="small" v-model="scope.row.packingInfo" placeholder="请填写包装信息"
                    v-show="scope.row.isUpdate"></el-input>
                  <span v-show="!scope.row.isUpdate">{{
                    scope.row.packingInfo
                  }}</span>
                </template>
              </el-table-column>
          </el-table>
        </div>
      </div>
@@ -420,6 +598,16 @@
          unit: org.unit,
          color: org.color,
          planningMethod: org.planningMethod,
          sharpenerNo: org.sharpenerNo,
          caveNum:org.caveNum,
          gramWeight:org.gramWeight,
          gateGramWeight:org.gateGramWeight,
          moldingCycle:org.moldingCycle,
          machine:org.machine,
          scale:org.scale,
          dryingTime:org.dryingTime,
          dryingTemperature:org.dryingTemperature,
          packingInfo: org.packingInfo,
          children: haveChildren ? org.children.map((i) => mapTree(i)) : []
        }
      }
@@ -472,7 +660,6 @@
            newObj.alternativeDesc = this.treeForm.alternativeDesc
            newObj.bomTypeDb = this.treeForm.bomTypeDb
            const gxqTree = this.preViewData.map((org) => mapTree(org))

            newObj.tree = gxqTree[0]
            addObj(newObj)
              .then((response) => {
@@ -653,6 +840,17 @@
          copyNoParent.operationId = noParent.operationId
          copyNoParent.operationName = noParent.operationName

          copyNoParent.sharpenerNo= noParent.sharpenerNo
          copyNoParent.caveNum=noParent.caveNum
          copyNoParent.gramWeight=noParent.gramWeight
          copyNoParent.gateGramWeight=noParent.gateGramWeight
          copyNoParent.moldingCycle=noParent.moldingCycle
          copyNoParent.machine=noParent.machine
          copyNoParent.scale=noParent.scale
          copyNoParent.dryingTime=noParent.dryingTime
          copyNoParent.dryingTemperature=noParent.dryingTemperature
          copyNoParent.packingInfo= noParent.packingInfo

          copyNoParent.discNum = noParent.discNum
          copyNoParent.qpa = noParent.qpa
          copyNoParent.originalQpa = noParent.originalQpa

 src/views/technology/structure/single-structure-form.vue

@@ -10,7 +10,7 @@
      </div>
    </div>
    <div class="page-main">
      <div class="single-structure-basic" style="height: 20%;">
      <div class="single-structure-basic" style="height: 22%;">
        <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
          <el-row>
            <el-col :span="24">