1.优化代码，2.完成工序缺陷页面3.模板下载功能

loulijun2021

2022-07-21 63fce2b793451ee340b7a0f6e0d6ce6c2d470dd0

1.优化代码，2.完成工序缺陷页面3.模板下载功能

 .env.development

@@ -3,5 +3,8 @@

# base api
VUE_APP_BASE_API = '/api/'
#VUE_APP_BASE_API = 'http://47.96.97.237/API/'


# 文件下载地址   下载数据模板地址
VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'


 .env.production

@@ -4,3 +4,6 @@
# base api
VUE_APP_BASE_API = '/apis/'


# 文件下载地址   下载数据模板地址
VUE_APP_BASE_API_FILE = 'http://121.196.36.24:8001'

 src/components/ImportPicker/index.vue

@@ -112,7 +112,7 @@
        <p>导入失败，失败的原因是{{ error_message }}！</p>
      </div>
    </div>
    <span slot="footer" class="dialog-footer">
    <span slot="footer" class="dialog-footer" style="display: flex;">
      <el-button v-if="button_text !=&quot;完成&quot;" @click="colos()">取 消</el-button>
      <el-button
        type="primary"
@@ -259,7 +259,15 @@
      //   }
      // })
      ExcelModelCheck(data).then(res => {

        this.div2_state = res.StuCode
        setTimeout(() => {
          this.cg4 = true
        }, 2000)
        this.error_list = res.list
        this.total_num = res.Count
        if (res.StuCode === '200') {
          this.disState = false
        }
      })
    },
    beforeUpload(file) {
@@ -342,7 +350,11 @@
      //   window.location.href = res
      // })
      DownLoadExcel(data).then(res => {
        window.location.href = res
        console.log(res.data)
        console.log(process.env.VUE_APP_BASE_API)
        console.log(process.env.VUE_APP_BASE_API_FILE)
        console.log(window.location.origin + res.data)
        window.location.href = process.env.VUE_APP_BASE_API_FILE + res.data
      })
    }
  }

 src/views/jcsz/jsqd.vue

@@ -54,7 +54,6 @@
        <el-table
          :data="tableData"
          border

          stripe
          :height="tableHeight+'px'"
          :style="{width: 100+'%',height:tableHeight+'px'}"
@@ -72,24 +71,29 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="role_code"
            label="角色编码"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="role_name"
            label="角色名称"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="roletype_name"
            label="角色类型"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="description"
            min-width="160"
            label="角色描述"
            sortable="custom"
          />
@@ -97,10 +101,12 @@
            prop="lm_user"
            label="创建人员"
            sortable="custom"
            width="110"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            min-width="160"
            sortable="custom"
          />
          <el-table-column
@@ -127,6 +133,7 @@
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">

 src/views/jcsz/wldw.vue

@@ -67,28 +67,30 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
            prop="code"
            label="单位编码"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="name"
            label="单位名称"
            sortable="custom"
            min-width="200px"
            min-width="160px"
          />
          <el-table-column
            label="单位属性"
            width="150"
            width="240"
          >
            <!--            sortable="custom"-->

            <el-table-column
              prop="mtype"
              width="120"
              width="80"
            >
              <template slot-scope="{row}">
                <div v-if="row.mtype==='WG'">外购供方</div>
@@ -97,7 +99,7 @@
            </el-table-column>
            <el-table-column
              prop="btype"
              width="120"
              width="80"
            >
              <template slot-scope="{row}">
                <div v-if="row.btype==='WX'">外协供方</div>
@@ -106,7 +108,7 @@
            </el-table-column>
            <el-table-column
              prop="htype"
              width="120"
              width="80"
            >
              <template slot-scope="{row}">
                <div v-if="row.htype==='KH'">客户</div>
@@ -117,31 +119,36 @@
          <el-table-column
            prop="conttacts"
            label="联系人"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="conttphone"
            label="联系方式"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="addr"
            min-width="160"
            label="补充描述"
            sortable="custom"
          />
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            sortable="custom"
            width="200"
            width="160"
          />
          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -213,7 +220,7 @@
import {
  AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
} from '@/api/jcsz'
import { SeaveSearchPartner, SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
import { SeaveSearchPartner } from '@/api/ErpSyncMes'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/jcsz/yhqd.vue

@@ -71,7 +71,7 @@
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-menu" @click="workingTramClick">生产班组</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -94,36 +94,43 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="usercode"
            label="用户编码"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="username"
            label="用户名称"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="password"
            label="用户密码"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="org_name"
            label="所属组织"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="group_name"
            label="生产班组"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="wagetype"
            label="工资类型"
            sortable="custom"
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.wagetype==='1'">计时制</div>
@@ -133,6 +140,7 @@
          <el-table-column
            prop="mobile"
            label="联系方式"
            min-width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -144,6 +152,7 @@
            prop="email"
            label="电子邮箱"
            sortable="custom"
            min-width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.email===''">/</div>
@@ -151,8 +160,9 @@
            </template>
          </el-table-column>
          <el-table-column
            prop=""
            prop="enable"
            label="在职状态"
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -163,17 +173,19 @@
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            width="200"
            width="160"
            sortable="custom"
          />
          <el-table-column
            prop="is_role"
            label="关联角色"
            width="110"
          >
            <template slot-scope="{row}">
              <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
@@ -182,6 +194,7 @@
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -461,16 +474,20 @@
        </div>
      </span>
    </el-dialog>

    <!--导入组件-->
    <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />

  </div>
</template>

<script>
import Pagination from '@/components/Pagination'
import ImportPicker from '@/components/ImportPicker'

import {
  AddUpdateUser,
  DeleteUser,
  RoleTypeAdd,
  RoleTypeDelete,
  SaveUserAssoctRole,
  UserAssociationRole,
  UserGroupAdd,
@@ -488,7 +505,7 @@
export default {
  name: 'YYQD',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  data() {
    const validateName = (rule, value, callback) => {
@@ -635,7 +652,10 @@
        page: 1,
        prop: 'group_code',
        order: 'desc'
      }
      },
      title_value: '数据导入 / 用户清单',
      code: '1',
      shows: false
    }
  },
  created() {
@@ -665,7 +685,11 @@
    },
    // 导入按钮
    upload() {

      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    // 排序改变时
    sortChange({ column, prop, order }) {

 src/views/jcsz/zzjg.vue

@@ -62,20 +62,24 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="org_code"
            label="组织编码"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="org_name"
            label="组织名称"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="description"
            label="组织类型"
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -90,6 +94,7 @@
            prop="parentorg_name"
            label="上级单位"
            sortable="custom"
            min-widt="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.parentorg_name===null">/</div>
@@ -99,14 +104,17 @@
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
            prop="lm_date"
            label="创建时间"
            width="160"
            sortable="custom"
          />
          <el-table-column
            fixed="right"
            label="操作"
          >
            <template slot-scope="{row}">
@@ -192,7 +200,6 @@
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { getNewEncodingRules } from '@/utils/global'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/sbgl/sbqd.vue

@@ -120,25 +120,30 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="code"
            label="设备编码"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="name"
            label="设备名称"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="eqptype_name"
            label="设备类型"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="eqpgroup_name"
            label="设备组"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
@@ -166,6 +171,7 @@
            prop="wksp_name"
            label="生产车间"
            sortable="custom"
            min-width="120"
          />
          <!--          <el-table-column-->
          <!--            prop="Line_name"-->
@@ -190,11 +196,13 @@
          />
          <el-table-column
            prop="lm_date"
            width="160"
            label="创建时间"
            sortable="custom"
          />
          <el-table-column
            label="操作"
            fixed="right"
            width="100"
          >
            <template slot-scope="{row}">
@@ -547,7 +555,6 @@

<script>
import Pagination from '@/components/Pagination'
import { getCookie } from '@/utils/auth'
import {
  AddUpdateDeviceGroup, AddUpdateDeviceManger,
  AddUpdateDeviceType, DeleteDeviceManger, DeleteDeviceType,

 src/views/scgl/gd.vue

@@ -132,6 +132,7 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="status"
@@ -152,14 +153,13 @@
            prop="wo_code"
            label="工单编号"
            sortable="custom"

            width="160"
            min-width="160"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            sortable="custom"
            width="120"
            min-width="120"
          />
          <el-table-column
            prop="partname"
@@ -189,7 +189,7 @@
            prop="route_name"
            label="工艺路线"
            sortable="custom"
            width="130"
            min-width="130"
          />

          <el-table-column
@@ -564,7 +564,7 @@
import { handleDatetime } from '@/utils/global'
import { getCookie } from '@/utils/auth'
import { MesOrderPrintSearch1 } from '@/api/utils'
import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/scgl/scdd.vue

@@ -164,6 +164,7 @@
          <el-table-column
            prop="RowNum"
            width="50"
            fixed
            label="序号"
          />
          <el-table-column
@@ -183,25 +184,25 @@
            prop="wo"
            label="订单编号"
            sortable="custom"
            width="150"
            min-width="150"
          />
          <el-table-column
            prop="partcode"
            label="产品编码"
            sortable="custom"
            width="150"
            min-width="150"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            sortable="custom"
            width="150"
            min-width="150"
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            sortable="custom"
            width="110"
            min-width="110"
          />
          <el-table-column
            prop="qty"
@@ -365,7 +366,7 @@
<script>
import Pagination from '@/components/Pagination'
import { ClosedErpOrder, ErpOrderSearch, MarkSaveErpOrder } from '@/api/scgl'
import { handleDatatime, handleDatetime } from '@/utils/global'
import { handleDatetime } from '@/utils/global'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'

const SER_HZ = /^[\u4e00-\u9fa5]+$/

 src/views/scgl/sckbg.vue

@@ -56,6 +56,7 @@
                prop="RowNum"
                width="50"
                label="序号"
                fixed
              />
              <el-table-column
                prop="status"
@@ -73,32 +74,37 @@
              <el-table-column
                prop="wo_code"
                label="工单号"
                min-width="160"
                sortable="custom"
              />
              <el-table-column
                prop="partcode"
                label="产品编码"
                min-width="110"
                sortable="custom"
              />
              <el-table-column
                prop="partname"
                min-width="110"
                label="产品名称"
                sortable="custom"
              />
              <el-table-column
                prop="stepname"
                label="工序"
                min-width="80"
                sortable="custom"
              />
              <el-table-column
                prop="descr"
                label="工序描述"
                width="150"
                min-width="150"
                sortable="custom"
              />
              <el-table-column
                prop="plan_qty"
                label="任务数量"
                width="110"
                sortable="custom"
              />
              <el-table-column
@@ -212,6 +218,7 @@
                prop="RowNum"
                width="50"
                label="序号"
                fixed
              />
              <el-table-column
                prop="status"
@@ -229,32 +236,37 @@
              <el-table-column
                prop="wo_code"
                label="工单号"
                min-width="160"
                sortable="custom"
              />
              <el-table-column
                prop="partcode"
                label="产品编码"
                min-width="110"
                sortable="custom"
              />
              <el-table-column
                prop="partname"
                label="产品名称"
                min-width="110"
                sortable="custom"
              />
              <el-table-column
                prop="stepname"
                label="工序"
                min-width="80"
                sortable="custom"
              />
              <el-table-column
                prop="descr"
                label="工序描述"
                width="150"
                min-width="150"
                sortable="custom"
              />
              <el-table-column
                prop="plan_qty"
                label="任务数量"
                width="110"
                sortable="custom"
              />
              <el-table-column
@@ -267,7 +279,6 @@
                prop="ng_qty"
                label="不良数量"
                width="150"

                sortable="custom"
              />
              <el-table-column
@@ -665,8 +676,7 @@
  SavaMesOrderStepStart,
  SavaMesOrderStepReport
} from '@/api/scgl'
import { urlAddRandomNo, webapp_urlprotocol_startup, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'
import { UserGroupDelete } from '@/api/jcsz'
import { urlAddRandomNo, webapp_ws_ajax_run, webapp_ws_autoupdate } from '@/utils/grwebapp'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/template.vue

@@ -99,6 +99,7 @@
          <el-table-column
            prop="lm_date"
            label="创建时间"
            width="160"
            sortable="custom"
          />
          <el-table-column

 src/views/wlgl/ckdy.vue

@@ -86,6 +86,7 @@
            prop="lm_date"
            label="创建时间"
            sortable="custom"
            width="160"
          />
          <el-table-column
            label="操作"
@@ -145,7 +146,7 @@
<script>
import Pagination from '@/components/Pagination'
import { AddUpdateWareHouseDef, DeleteWareHouseDef, WareHouseDefSearch } from '@/api/wlgl'
import { SeaveSearchInventoryClass, SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
import { SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/wlgl/kwdy.vue

@@ -101,6 +101,7 @@
            prop="lm_date"
            label="创建时间"
            sortable="custom"
            width="160"
          />
          <el-table-column
            label="操作"
@@ -176,7 +177,7 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseDefSearch, WareHouseSelect } from '@/api/wlgl'
import { AddUpdateStorageDef, DeleteStorageDef, StorageDefSearch, WareHouseSelect } from '@/api/wlgl'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/zlgl/gxjy.vue

@@ -98,7 +98,9 @@
            highlight-current-row
            :header-cell-style="this.$headerCellStyle"
            :cell-style="this.$cellStyle"
            :row-class-name="tableRowClassName"
            @selection-change="handleSelectionChange"
            @cell-dblclick="cellDblclick"
          >
            <el-table-column
              type="index"
@@ -141,9 +143,17 @@
              prop="stepcheckitem_desc"
              label="检验标准描述"
            >
              <template slot-scope="{row}">
                <el-input v-if="row.isVisible===1" v-model="row.stepcheckitem_desc" placeholder="请输入" />
                <div v-else> {{ row.stepcheckitem_desc }}</div>
              <template slot-scope="scope">
                <el-input
                  v-if="scope.row.isVisible===1||scope.row.index === tabClickIndex && tabClickLabel === '检验标准描述'"
                  v-model="scope.row.stepcheckitem_desc"
                  placeholder="请输入"
                  @keyup.enter.native="val=>keyUpEnterNative(val,scope.row)"
                />
                <div
                  v-else
                > {{ scope.row.stepcheckitem_desc }}</div>

              </template>
            </el-table-column>

@@ -242,7 +252,6 @@
// const SER_HZ = /^[\u4e00-\u9fa5]+$/
import $ from 'jquery'
import {
  DeleteStepCheckStaned,
  MesOrderStepCheckItemList,
  MesOrderStepCheckSearch,
  MesOrderStepCheckSelect, SaveMesOrderStepCheckItem,
@@ -283,7 +292,9 @@
      JYTableData: [], // 检验项信息表格
      JYSelectArr: [], // 检验下拉数组
      JYSelectedArr: [], // 已选检验项目数组
      multipleSelection: []// 表格多选框
      multipleSelection: [], // 表格多选框
      tabClickIndex: null, // 点击的单元格
      tabClickLabel: '' // 当前点击的列名
    }
  },
  created() {
@@ -330,12 +341,13 @@
        number = number === 0 ? (10 + Math.random()) : number

        // item.result = 0 // 0合格  1不良
        item.result = 'NG'
        item.result = 'OK'

        item.isVisible = 0
        item.number = number
        this.JYSelectedArr.push(item.code)
      })
      this.$refs.multipleTable.toggleAllSelection()
    },
    // changeRadioValue(val, row) {
    //   console.log(val, row.result, 20000)
@@ -354,14 +366,11 @@
          it.result = 'NG'
        }
      })
      if (this.multipleSelection.length > 0) {
        if (this.multipleSelection.length === this.JYTableData.length) {
          this.checkResult = 'OK'
        } else {
          this.checkResult = 'NG'
        }

      if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
        this.checkResult = 'OK'
      } else {
        this.checkResult = ''
        this.checkResult = 'NG'
      }
    },
    // 检验项目编码（名称）
@@ -390,8 +399,9 @@

      let number = Math.random() * Math.random()// 作为删除时的标识符
      number = number === 0 ? (10 + Math.random()) : number
      const data = { result: 'NG', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
      const data = { result: 'OK', code: '', name: '', stepcheckitem_desc: '', isVisible: 1, number }
      this.JYTableData.push(data)
      this.$refs.multipleTable.toggleRowSelection(data, true)
    },

    //  确认
@@ -415,14 +425,10 @@
        }
      })

      if (this.multipleSelection.length > 0) {
        if (this.multipleSelection.length === this.JYTableData.length) {
          this.checkResult = 'OK'
        } else {
          this.checkResult = 'NG'
        }
      if (this.multipleSelection.length > 0 && this.multipleSelection.length === this.JYTableData.length) {
        this.checkResult = 'OK'
      } else {
        this.checkResult = ''
        this.checkResult = 'NG'
      }
    },
    //  取消
@@ -439,6 +445,7 @@
        }
      })
    },

    // 删除
    del(row) {
      this.JYTableData.forEach((item, index) => {
@@ -530,6 +537,33 @@
      this.form.stepcode = ''
      this.form.stepname = ''
    },

    // 单元格被点击时
    cellDblclick(row, column, cell, event) {
      console.log(row, column, cell, event)
      console.log(column.label)
      console.log(row.index)
      switch (column.label) {
        case '检验标准描述':
          this.tabClickIndex = row.index
          this.tabClickLabel = column.label
          break
        // case '判责金额(元)':
        //   this.tabClickIndex = row.index
        //   this.tabClickLabel = column.label
        //   break
        default: return
      }
    },
    // 回车事件
    keyUpEnterNative(val, row) {
      this.tabClickLabel = ''
    },

    tableRowClassName({ row, rowIndex }) {
      // 把每一行的索引放进row
      row.index = rowIndex
    },
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {

 src/views/zlgl/gxjybz.vue

@@ -246,7 +246,6 @@

<script>
import Pagination from '@/components/Pagination'
import { DeleteOrganization } from '@/api/jcsz'
import {
  AddUpdateStepCheckStaned, DeleteStepCheckStaned,
  EditStepCheckStanedSearch,

 src/views/zlgl/gxjyxm.vue

@@ -135,9 +135,7 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { AddUpdateStepCheckItem, DedectSearch, DeleteStepCheckItem, StepCheckItemSearch } from '@/api/zlgl'
import { AddUpdateStepCheckItem, DeleteStepCheckItem, StepCheckItemSearch } from '@/api/zlgl'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/zlgl/qxdy.vue

@@ -136,8 +136,6 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { AddUpdateDedect, DedectSearch, DeleteDedect } from '@/api/zlgl'

const SER_HZ = /^[\u4e00-\u9fa5]+$/

 src/views/zzmx/chda.vue

@@ -122,14 +122,17 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="partcode"
            label="物料编码"
            min-width="160"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            min-width="160"
            label="物料名称"
            sortable="custom"
          />
@@ -149,6 +152,7 @@
            prop="stocktypename"
            label="存货类型"
            sortable="custom"
            min-width="110"
          />
          <!--          <el-table-column-->
          <!--            prop="materialtypename"-->
@@ -159,6 +163,7 @@
            prop="stck_name"
            label="仓库名称"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="maxqty"
@@ -198,6 +203,7 @@
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -560,11 +566,6 @@

<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateOrganization,
  DeleteOrganization
} from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import { WareHouseSelect } from '@/api/wlgl'
import {
  AddUpdateInventoryFile, DeleteInventoryFile, InventoryFileAssociationRoute,
@@ -576,7 +577,7 @@
  UomSearch, UomSelect
} from '@/api/zzmx'
import $ from 'jquery'
import { SeaveSearchErpOrder, SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'
import { SeaveSearchInventory, SeaveSearchInventoryClass, SeaveSearchUnit } from '@/api/ErpSyncMes'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/zzmx/gxdy.vue

@@ -17,7 +17,13 @@
              <el-input v-model="form.stepname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="启用状态" style=" display: flex;">
              <el-select v-model="form.enable" filterable :popper-append-to-body="false" style="width: 200px" placeholder="请选择">
              <el-select
                v-model="form.enable"
                filterable
                :popper-append-to-body="false"
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in enableArr"
                  :key="item.code"
@@ -78,19 +84,23 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="stepcode"
            label="工序编码"
            min-width="150"
            sortable="custom"
          />
          <el-table-column
            prop="stepname"
            min-width="150"
            label="工序名称"
            sortable="custom"
          />
          <el-table-column
            prop="flwtype"
            min-width="150"
            label="工序类型"
            sortable="custom"
          >
@@ -103,12 +113,14 @@
          <el-table-column
            prop="descr"
            label="工序描述"
            min-width="180"
            sortable="custom"
          />
          <el-table-column
            prop="enable"
            label="启用状态"
            sortable="custom"
            width="110"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'">是</div>
@@ -118,6 +130,7 @@
          <el-table-column
            prop="lm_user"
            label="创建人员"
            width="110"
            sortable="custom"
          />
          <el-table-column
@@ -129,6 +142,7 @@
          <el-table-column
            label="关联工作站"
            prop="is_eqp"
            width="110"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -140,6 +154,7 @@
          <el-table-column
            label="关联缺陷"
            prop="is_defect"
            width="110"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -150,6 +165,7 @@
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -363,8 +379,6 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization, OrganizationSearch, PrentOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import {
  AddUpdateStep,
  DeleteStep, SaveStepAssociationDefect,
@@ -914,7 +928,7 @@
      this.defectDialogVisible = false
    },
    // 确认
    async  defectDialogVisibleConfirm() {
    async defectDialogVisibleConfirm() {
      const nodeKey = this.$refs.defectTree.getCheckedKeys()
      const data = []
      this.defectTree[0].children.forEach(item => {

 src/views/zzmx/gylx.vue

@@ -90,6 +90,7 @@
            prop="lm_date"
            label="创建时间"
            sortable="custom"
            width="160"
          />
          <el-table-column
            label="操作"
@@ -258,7 +259,7 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateRoute, DeleteRoute, RouteSearch, RouteSelect, StepSelect, ViewRoute } from '@/api/zzmx'
import { AddUpdateRoute, DeleteRoute, RouteSearch, StepSelect, ViewRoute } from '@/api/zzmx'

const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {

 src/views/zzmx/jpgj.vue

@@ -114,41 +114,48 @@
            prop="RowNum"
            width="50"
            label="序号"
            fixed
          />
          <el-table-column
            prop="partcode"
            min-width="160"
            label="产品编码"
            sortable="custom"
          />
          <el-table-column
            prop="partname"
            label="产品名称"
            min-width="160"
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            width="110"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="wksp_name"
            label="生产车间"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="route_name"
            label="工艺路线"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="stepname"
            label="加工工序"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="eqp_name"
            label="加工设备"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
@@ -178,6 +185,7 @@

          <el-table-column
            label="操作"
            fixed="right"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -308,16 +316,19 @@
            prop="eqpcode"
            label="设备编码"
            sortable="custom"
            min-width="110"
          />
          <el-table-column
            prop="eqpname"
            label="设备名称"
            min-width="110"
            sortable="custom"
          />
          <el-table-column
            prop="wksp_name"
            sortable="custom"
            label="生产车间"
            min-width="110"
          />
          <el-table-column
            sortable="custom"
@@ -423,8 +434,6 @@

<script>
import Pagination from '@/components/Pagination'
import { AddUpdateOrganization, DeleteOrganization } from '@/api/jcsz'
import { getCookie } from '@/utils/auth'
import {
  BeatRateSearch, DeleteBeatRate,
  PartSelect,