suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工艺信息修改

Browse Source
dev-scheduling
zhangdi 1 month ago
parent 1f5fb923d0
commit c0da06aa4c
6 changed files with 470 additions and 329 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 418
      src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
  2. 4
      src/views/processManagement/components/processMainte/dsPartIndex.vue
  3. 3
      src/views/processManagement/procepssPlanning.vue
  4. 3
      src/views/processManagement/sinTer/index.vue
  5. 31
      src/views/processManagement/taskDispatch.vue
  6. 36
      src/views/processManagement/taskProcessing.vue

418
src/views/processManagement/components/processMainte/dsPartBasicInfo.vue
Unescape View File

@ -8,92 +8,47 @@
ref="testForm" ref="testForm"
:model="formData" :model="formData"
:rules="rules" :rules="rules"
label-width="120px" label-width="90px"
label-position="right" label-position="right"
:validate-on-rule-change="false" :validate-on-rule-change="false"
class="vd-form-three" class="vd-form-three"
> >
<template v-if="partType == '热表'">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="8"> <el-col :span="6">
<el-form-item label="零件号:" prop="partCode"> <el-form-item label="零件号:" prop="partCode">
<el-input v-model="formData.partCode" disabled placeholder="请输入" /> <el-input v-model="formData.partCode" disabled placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="零件名称:" prop="partName"> <el-form-item label="零件名称:" prop="partName">
<el-input v-model="formData.partName" disabled placeholder="请输入" /> <el-input v-model="formData.partName" disabled placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="(notSinTer && notGlassCake) || partType == '热表'"> <el-col :span="6">
<el-form-item label="产品型号:" prop="productType"> <el-form-item label="产品型号:" prop="productType">
<el-input v-model="formData.productType" placeholder="请输入" disabled /> <el-input v-model="formData.productType" placeholder="请输入" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="8"> <el-col :span="6">
<el-form-item label="相似零件:" prop="productType">
</el-form-item>
</el-col> :disabled="disabled"-->
<el-col :span="8">
<el-form-item label="是否为玻璃饼:" prop="isClassCake">
<el-switch
v-model="formData.isClassCake"
disabled
active-color="#13ce66"
inactive-color="#ff4949"
active-value="1"
inactive-value="0"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否印字:" prop="isPrint"> <el-form-item label="是否印字:" prop="isPrint">
<el-radio-group v-model="formData.isPrint" v-if="notGlassCake && partType != '热表'"> <el-radio-group v-model="formData.isPrint">
<el-radio value="2">单</el-radio>
<el-radio value="3">双</el-radio>
<el-radio value="1">否</el-radio>
</el-radio-group>
<el-radio-group v-model="formData.isPrint" v-if="partType == '热表'">
<el-radio value="2">是</el-radio> <el-radio value="2">是</el-radio>
<el-radio value="1">否</el-radio> <el-radio value="1">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-col
:span="8"
v-if="((notSinTer || !notGlassCake) && partType == '烧结') || partType == '热表'"
>
<el-form-item label="材料:" prop="material"> <el-form-item label="材料:" prop="material">
<el-input v-model="formData.material" placeholder="请输入" /> <el-input v-model="formData.material" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="(child || formData.glassCake) && formData.sinTerType != 5"> <el-col :span="6">
<el-form-item label="粉重:" prop="powderWeight">
<el-input v-model="formData.powderWeight" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="!notGlassCake">
<el-form-item label="成型厚度:" prop="formingThickness">
<el-input v-model="formData.formingThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8" v-if="(notSinTer || !notGlassCake) && partType == '烧结'">
<el-form-item label="面积(dm²):">
<el-input v-model="formData.area" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="硬度:" prop="hardness"> <el-form-item label="硬度:" prop="hardness">
<el-input v-model="formData.hardness" placeholder="请输入" /> <el-input v-model="formData.hardness" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="材料:" prop="material">
<el-input v-model="formData.material" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物料编码:" prop="plateGoodsCode"> <el-form-item label="物料编码:" prop="plateGoodsCode">
<el-select <el-select
v-model="formData.plateGoodsCode" v-model="formData.plateGoodsCode"
@ -107,83 +62,55 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<template v-if="partType == '热表'"> <el-col :span="6">
<el-col :span="8"> <el-form-item label="产品应用领域:" prop="productApplicationArea">
<el-input v-model="formData.productApplicationArea" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="镀种1:" prop="plate"> <el-form-item label="镀种1:" prop="plate">
<el-input v-model="formData.plate" placeholder="请输入" /> <el-input v-model="formData.plate" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="镀层代号1:" prop="plateCode"> <el-form-item label="镀层代号1:" prop="plateCode">
<el-input v-model="formData.plateCode" placeholder="请输入" /> <el-input v-model="formData.plateCode" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="面积1(dm²):" prop="area"> <el-form-item label="面积1(dm²):" prop="area">
<el-input v-model="formData.area" placeholder="请输入" /> <el-input v-model="formData.area" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="镀层厚度1:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="镀种2:" prop="plateTwo"> <el-form-item label="镀种2:" prop="plateTwo">
<el-input v-model="formData.plateTwo" placeholder="请输入" /> <el-input v-model="formData.plateTwo" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="镀层代号2:" prop="plateCodeTwo"> <el-form-item label="镀层代号2:" prop="plateCodeTwo">
<el-input v-model="formData.plateCodeTwo" placeholder="请输入" /> <el-input v-model="formData.plateCodeTwo" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="面积2(dm²):" prop="areaTwo"> <el-form-item label="面积2(dm²):" prop="areaTwo">
<el-input v-model="formData.areaTwo" placeholder="请输入" /> <el-input v-model="formData.areaTwo" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="镀层厚度1:" prop="plateThickness"> <el-col :span="6">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="镀层厚度2:" prop="plateThickness"> <el-form-item label="镀层厚度2:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" /> <el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</template>
<el-col :span="8" v-if="partType == '烧结' && !formData.isGlassCake">
<el-form-item label="镀层厚度:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品应用领域:" prop="productApplicationArea">
<el-input v-model="formData.productApplicationArea" placeholder="请输入" />
</el-form-item>
</el-col>
<template v-if="partType == '烧结'">
<el-col :span="8">
<el-form-item label="玻璃饼直径">
<el-input-number
:max="100000"
:min="0"
v-model="formData.blbDiameter"
precision="10"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="壳体最大外径">
<el-input-number
:max="100000"
:min="0"
v-model="formData.externalDiameter"
precision="10"
/>
</el-form-item>
</el-col>
</template>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="16"> <el-col :span="16">
<el-form-item label="工艺路线:"> <el-form-item label="工艺路线:">
@ -193,7 +120,7 @@
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="8"> <el-col :span="6">
<el-form-item label="涂色标个数:" prop="tsbNum"> <el-form-item label="涂色标个数:" prop="tsbNum">
<el-input-number <el-input-number
v-model="formData.tsbNum" v-model="formData.tsbNum"
@ -204,7 +131,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="涂色带个数:" prop="tsdNum"> <el-form-item label="涂色带个数:" prop="tsdNum">
<el-input-number <el-input-number
v-model="formData.tsdNum" v-model="formData.tsdNum"
@ -215,7 +142,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-form-item label="涂箭头个数:" prop="tjtNum"> <el-form-item label="涂箭头个数:" prop="tjtNum">
<el-input-number <el-input-number
v-model="formData.tjtNum" v-model="formData.tjtNum"
@ -228,7 +155,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="16"> <el-col :span="14">
<el-form-item label="色标色带:" prop="memo"> <el-form-item label="色标色带:" prop="memo">
<el-input <el-input
v-model="formData.memo" v-model="formData.memo"
@ -243,7 +170,7 @@
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="16"> <el-col :span="14">
<el-form-item label="关键信息:" prop="keyInfo"> <el-form-item label="关键信息:" prop="keyInfo">
<el-input <el-input
v-model="formData.keyInfo" v-model="formData.keyInfo"
@ -257,7 +184,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="8"> <el-col :span="5">
<el-form-item label="有效期:" prop="periodOfValidity"> <el-form-item label="有效期:" prop="periodOfValidity">
<el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn"> <el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn">
<el-radio value="1">长期有效</el-radio> <el-radio value="1">长期有效</el-radio>
@ -265,19 +192,18 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="formData.periodOfValidity == '2'"> <el-col :span="6" v-if="formData.periodOfValidity == '2'">
<el-form-item label="有效周期(天):" prop="expirationPeriod"> <el-form-item label="有效周期(天):" prop="expirationPeriod" label-width="100px">
<el-input-number <el-input-number
:max="100000" :max="100000"
:min="0" :min="0"
v-model="formData.expirationPeriod" v-model="formData.expirationPeriod"
controls-position="right" controls-position="right"
placeholder="请输入" placeholder="请输入"
style="width: 250px"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8" v-if="formData.periodOfValidity == '2'"> <el-col :span="6" v-if="formData.periodOfValidity == '2'">
<el-form-item label="到期提醒(天):" prop="advanceRemind"> <el-form-item label="到期提醒(天):" prop="advanceRemind">
<el-input-number <el-input-number
:max="100000" :max="100000"
@ -285,16 +211,12 @@
v-model="formData.advanceRemind" v-model="formData.advanceRemind"
controls-position="right" controls-position="right"
placeholder="请输入" placeholder="请输入"
style="width: 250px"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col <el-col :span="24">
:span="24"
v-if="partType == '热表' || (partType == '烧结' && formData.isGlassCake)"
>
<el-form-item label="工艺校验:" prop="sinTer"> <el-form-item label="工艺校验:" prop="sinTer">
<div style="width: 100%"> <div style="width: 100%">
<el-checkbox v-model="formData.goldMark" disabled>镀金标识</el-checkbox> <el-checkbox v-model="formData.goldMark" disabled>镀金标识</el-checkbox>
@ -327,19 +249,254 @@
>喷码</el-checkbox >喷码</el-checkbox
> >
</div> </div>
<!-- <div style="width: 100%" v-if="formData.goldMark==1 && partType == '热表'">
<el-text class="mx-1" type="danger">本零件需要编制一级和二级工艺！</el-text>
</div> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</template>
<template v-if="partType == '烧结'">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="零件号:" prop="partCode">
<el-input v-model="formData.partCode" disabled placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="零件名称:" prop="partName">
<el-input v-model="formData.partName" disabled placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="产品型号:" prop="productType">
<el-input v-model="formData.productType" placeholder="请输入" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否为玻璃饼:" prop="isClassCake">
<el-switch
v-model="formData.isClassCake"
disabled
active-color="#13ce66"
inactive-color="#ff4949"
active-text="是"
inactive-text="否"
active-value="1"
inactive-value="0"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="是否印字:" prop="isPrint">
<el-radio-group v-model="formData.isPrint" v-if="notGlassCake">
<el-radio value="2">单</el-radio>
<el-radio value="3">双</el-radio>
<el-radio value="1">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer || !notGlassCake">
<el-form-item label="面积(dm²):">
<el-input v-model="formData.area" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer || !notGlassCake">
<el-form-item label="材料:" prop="material">
<el-input v-model="formData.material" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="硬度:" prop="hardness">
<el-input v-model="formData.hardness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="物料编码:" prop="plateGoodsCode">
<el-select
v-model="formData.plateGoodsCode"
placeholder="请选择"
style="width: 250px"
clearable
filterable
>
<el-option :value="'04-05-023'" label="金钾-04-05-023" />
<el-option :value="'04-05-024'" label="银板-04-05-024" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="镀种:" prop="plate">
<el-input v-model="formData.plate" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="镀层代号:" prop="plateCode">
<el-input v-model="formData.plateCode" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="面积(dm²):" prop="area">
<el-input v-model="formData.area" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="(child || formData.glassCake) && formData.sinTerType != 5">
<el-form-item label="粉重:" prop="powderWeight">
<el-input v-model="formData.powderWeight" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="notSinTer && notGlassCake">
<el-form-item label="镀层厚度:" prop="plateThickness">
<el-input v-model="formData.plateThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6" v-if="!notGlassCake">
<el-form-item label="成型厚度:" prop="formingThickness">
<el-input v-model="formData.formingThickness" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品应用领域:" prop="productApplicationArea">
<el-input v-model="formData.productApplicationArea" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="玻璃饼直径">
<el-input-number
:max="100000"
:min="0"
v-model="formData.blbDiameter"
precision="10"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="壳体最大外径">
<el-input-number
:max="100000"
:min="0"
v-model="formData.externalDiameter"
precision="10"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item label="涂色标个数:" prop="tsbNum">
<el-input-number
v-model="formData.tsbNum"
:min="1"
:max="10"
controls-position="right"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="涂色带个数:" prop="tsdNum">
<el-input-number
v-model="formData.tsdNum"
:min="1"
:max="10"
controls-position="right"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="涂箭头个数:" prop="tjtNum">
<el-input-number
v-model="formData.tjtNum"
:min="1"
:max="10"
controls-position="right"
placeholder="请输入"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" v-if="notGlassCake || !notSinTer">
<el-col :span="24">
<el-form-item label="工艺路线:">
{{ formData.craftWay }}
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item label="关键信息:" prop="keyInfo">
<el-input
v-model="formData.keyInfo"
type="textarea"
maxlength="150"
show-word-limit
rows="3"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item label="色标色带:" prop="memo">
<el-input
v-model="formData.memo"
:rows="3"
type="textarea"
maxlength="150"
show-word-limit
placeholder="请输入"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="5">
<el-form-item label="有效期:" prop="periodOfValidity">
<el-radio-group v-model="formData.periodOfValidity" @change="periodOfValidityFn">
<el-radio value="1">长期有效</el-radio>
<el-radio value="2">自定义</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-if="formData.periodOfValidity == '2'">
<el-form-item label="有效周期(天):" prop="expirationPeriod" label-width="100px">
<el-input-number
:max="100000"
:min="0"
v-model="formData.expirationPeriod"
controls-position="right"
placeholder="请输入"
/>
</el-form-item>
</el-col>
<el-col :span="6" v-if="formData.periodOfValidity == '2'">
<el-form-item label="到期提醒(天):" prop="advanceRemind">
<el-input-number
:max="100000"
:min="0"
v-model="formData.advanceRemind"
controls-position="right"
placeholder="请输入"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="工艺校验:" prop="sinTer">
<div style="width: 100%">
<el-checkbox v-model="formData.goldMark" disabled>镀金标识</el-checkbox>
<el-checkbox
v-model="formData.markingsTest"
@change="setDataLocal"
:true-label="'1'"
:false-label="'0'"
>涂色标</el-checkbox
>
</div>
</el-form-item>
</el-col>
</el-row>
</template>
</el-form> </el-form>
</el-card> </el-card>
<el-card <el-card class="box-card" v-if="data.length > 0" style="margin-top: 24px">
class="box-card"
v-if="formData.isSintering == '1' && formData.isClassCake == '0'"
style="margin-top: 24px"
>
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span style="font-size: 16px">子件信息</span> <span style="font-size: 16px">子件信息</span>
</div> </div>
@ -645,15 +802,16 @@ export default {
if (this.data.length > 0) { if (this.data.length > 0) {
this.data.forEach(item => { this.data.forEach(item => {
item.$cellEdit = true; item.$cellEdit = true;
if (item.area < 0) {
item.totalArea = 0;
} else {
item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串） item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
// if (item.sinTerType == 1 && item.partName.indexOf('A1') > -1) { }
// item.isElectroplating = '1';
// }
}); });
} }
this.partType = res.data.data.dsPartEntity.isSintering == '1' ? '烧结' : '热表'; this.partType = res.data.data.dsPartEntity.isSintering == '1' ? '烧结' : '热表';
// this.partType = '烧结';
if (this.formData.sinTerType == 3) { if (this.formData.sinTerType == 3) {
this.formData.glassCake = true; this.formData.glassCake = true;
} else if (this.formData.sinTerType == 5) { } else if (this.formData.sinTerType == 5) {

4
src/views/processManagement/components/processMainte/dsPartIndex.vue
Unescape View File

@ -33,10 +33,6 @@ import dsPartBasicInfo from './dsPartBasicInfo.vue';
import dsCraftPage from './dsCraft.vue' import dsCraftPage from './dsCraft.vue'
import processPlanning from './processPlanning.vue' import processPlanning from './processPlanning.vue'
import {
getPartDetail,getModelList
} from '@/api/processManagement/taskProcessing';
export default { export default {
name: 'DsPartIndex', name: 'DsPartIndex',
components: { components: {

3
src/views/processManagement/procepssPlanning.vue
Unescape View File

@ -233,7 +233,7 @@ export default {
sortable: true, sortable: true,
search: false, search: false,
overHidden: true, overHidden: true,
width: 120,
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
}, },
@ -245,6 +245,7 @@ export default {
overHidden: true, overHidden: true,
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
width: 120,
}, },
], ],
}, },

3
src/views/processManagement/sinTer/index.vue
Unescape View File

@ -82,7 +82,6 @@ export default {
height: 'auto', height: 'auto',
calcHeight: 32, calcHeight: 32,
tip: false, tip: false,
size: 'medium',
simplePage: true, simplePage: true,
searchShow: true, searchShow: true,
searchMenuSpan: 6, searchMenuSpan: 6,
@ -183,7 +182,7 @@ export default {
if (this.form.zijian != '') { if (this.form.zijian != '') {
this.isComponentOpen = false; this.isComponentOpen = false;
this.isSubOpen = true; this.isSubOpen = true;
getSinteringPart({ partCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => { getSinteringPart({ bPartCode: this.form.bujian, zPartCode: this.form.zijian }).then(res => {
this.data = res.data.data; this.data = res.data.data;
}); });
} else if (this.form.bujian != '') { } else if (this.form.bujian != '') {

31
src/views/processManagement/taskDispatch.vue
Unescape View File

@ -220,13 +220,13 @@ export default {
return; return;
} }
this.updateRow = this.selectionList; this.updateRow = this.selectionList;
this.selectionList.forEach(item => { // this.selectionList.forEach(item => {
if (item.children && item.children.length > 0) { // if (item.children && item.children.length > 0) {
item.children.forEach(element => { // item.children.forEach(element => {
this.updateRow.push(element); // this.updateRow.push(element);
}); // });
} // }
}); // });
// console.log(5555, this.updateRow); // console.log(5555, this.updateRow);
this.setCrewOpen = true; this.setCrewOpen = true;
this.title = '批量分派'; this.title = '批量分派';
@ -234,28 +234,25 @@ export default {
// 设置班组人员 // 设置班组人员
setCrew(row) { setCrew(row) {
this.updateRow = [row]; this.updateRow = [row];
if (row.children.length > 0) { // if (row.children.length > 0) {
row.children.forEach(element => { // row.children.forEach(element => {
this.updateRow.push(element); // this.updateRow.push(element);
}); // });
} // }
// console.log(999999, this.updateRow); // console.log(999999, this.updateRow);
this.setCrewOpen = true; this.setCrewOpen = true;
this.title = '分派'; this.title = '分派';
}, },
// 设置班组人员弹框关闭 // 设置班组人员弹框关闭
setCrewOpeSancel(isRefresh) { setCrewOpeSancel(isRefresh) {
// if (isRefresh) {
// this.$refs.myTable.load();
// }
this.setCrewOpen = false; this.setCrewOpen = false;
this.onLoad(this.page); this.onLoad(this.page,this.query);
}, },
// 重置 // 重置
searchReset() { searchReset() {
this.query = {}; this.query = {};
this.parentId = 0; this.parentId = 0;
this.onLoad(this.page); this.onLoad(this.page,this.query);
}, },
// 搜索 // 搜索
searchChange(params, done) { searchChange(params, done) {

36
src/views/processManagement/taskProcessing.vue
Unescape View File

@ -31,7 +31,7 @@
type="primary" type="primary"
link link
@click="organization(scope.row.partId, scope.row)" @click="organization(scope.row.partId, scope.row)"
v-if="scope.row.taskStatus == 2" v-if="scope.row.taskStatus == 2|| scope.row.sinTerType != -1"
>编制</el-button >编制</el-button
> >
<!-- <el-button <!-- <el-button
@ -83,7 +83,6 @@
v-if="isOpen" v-if="isOpen"
:part-id="partId" :part-id="partId"
@cancel="cancel" @cancel="cancel"
:partType="partType"
:dialogType="dialogType" :dialogType="dialogType"
:updateRow="updateRow" :updateRow="updateRow"
></dsPartIndex> ></dsPartIndex>
@ -344,16 +343,16 @@ export default {
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'center',
}, },
{ // {
label: '接收时间', // label: '接收时间',
prop: 'receptionTime', // prop: 'receptionTime',
sortable: true, // sortable: true,
search: false, // search: false,
overHidden: true, // overHidden: true,
width: 180, // width: 180,
headerAlign: 'center', // headerAlign: 'center',
align: 'center', // align: 'center',
}, // },
], ],
}, },
data: [], data: [],
@ -420,13 +419,8 @@ export default {
this.showPartDetails = true; this.showPartDetails = true;
this.partId = partId; this.partId = partId;
this.detailsRow = row; this.detailsRow = row;
this.dialogType = 'view'; this.dialogType = 'view';
if (row.children && row.children.length >= 0) {
this.partType = '烧结';
} else {
this.partType = '热表';
}
}, },
// 编制 // 编制
organization(partId, row) { organization(partId, row) {
@ -439,11 +433,7 @@ export default {
} }
this.dialogType = 'edit'; this.dialogType = 'edit';
if (row.children && row.children.length >= 0) {
this.partType = '烧结';
} else {
this.partType = '热表';
}
}, },
// 转派 // 转派
setBathCrew(row) { setBathCrew(row) {

Write Preview
Loading…
Cancel
Save