Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-19 2fa578a18ed9055f8cb9863a8a0f02977cfa8350

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/const/crud/customerOrder/customerOrderForm.js

@@ -39,30 +39,6 @@
    minWidth: 200,
    span: 24
  }, {
    label: '零件规格',
    prop: 'customerPartSpec',
    type: 'input',
    cell: true,
    minWidth: 200,
    span: 24
  }, {
    label: '制造属性',
    prop: 'manufactureAttr',
    cell: true,
    type: 'select',
    minWidth: 200,
    span: 24,
    dicData:[{
        label: '普通',
        value: 'N'
    },{
        label: '样品',
        value: 'S'
    },{
        label: '研发',
        value: 'D'
    }]
  }, {
    label: '产品名称',
    prop: 'productName',
    cell: true,
@@ -70,13 +46,13 @@
    minWidth: 200,
    span: 24
  }, {
    label: '隶属品牌',
    prop: 'productType',
    cell: true,
    label: '规格型号',
    prop: 'customerPartSpec',
    type: 'input',
    cell: true,
    minWidth: 200,
    span: 24
  }, {
  },  {
    label: '单位',
    prop: 'otcUnit',
    slot: true,
@@ -95,6 +71,30 @@
    span: 24,
    rules:[{required:true,message:'类型必须是数字',trigger:'blur'}]
  }, {
    label: '制造属性',
    prop: 'manufactureAttr',
    cell: true,
    type: 'select',
    minWidth: 200,
    span: 24,
    dicData:[{
        label: '普通',
        value: 'N'
    },{
        label: '样品',
        value: 'S'
    },{
        label: '研发',
        value: 'D'
    }]
  }, {
    label: '隶属品牌',
    prop: 'productType',
    cell: true,
    type: 'input',
    minWidth: 200,
    span: 24
  },{
    label: '收货地址',
    prop: 'shippingAddress',
    cell: true,

 src/page/index/sidebar/index.vue

@@ -4,7 +4,7 @@
    <el-scrollbar style="height:100%">
      <div v-if="validatenull(menu)" class="avue-sidebar--tip">没有发现菜单</div>
      <el-menu :default-active="nowTagValue" :show-timeout="200" :collapse="keyCollapse" unique-opened mode="vertical">
        <sidebar-item :menu="menu" :screen="screen" :props="website.menu.props" :collapse="keyCollapse" first />
        <sidebar-item :menu="filterMenu" :screen="screen" :props="website.menu.props" :collapse="keyCollapse" first />
      </el-menu>
    </el-scrollbar>
  </div>
@@ -16,6 +16,10 @@
import sidebarItem from './sidebarItem'
export default {
  name: 'Sidebar',
  data(){
    return {
    }
  },
  inject: ["Index"],
  components: { sidebarItem, logo },
  created() {
@@ -23,10 +27,15 @@
  },
  computed: {
    ...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),
    filterMenu: function(){
      return this.menu.filter(ele=>{
        return ele.children.length > 0
      })
    },
    nowTagValue: function () {
      return this.$router.$avueRouter.getValue(this.$route)
    }
  }
  },
}
</script>


 src/page/index/sidebar/sidebarItem.vue

@@ -25,7 +25,7 @@
        <template v-for="(child,cindex) in item[childrenKey]">
          <el-menu-item
            v-if="validatenull(child[childrenKey])"
            :index="child[pathKey],cindex"
            :index="child[pathKey]"
            :class="{'is-active':vaildAvtive(child)}"
            :key="child[labelKey]"
          >

 src/page/login/index.vue

@@ -74,35 +74,35 @@
  created() {
    this.getSysTitle()
  },
  mounted() {
    const _that = this
    $.ajax({
      type: 'get',
      url: 'http://127.0.0.1:15211/LocalUnique',
      /* headers: {
                'Content-Type': 'text/xml;charset=utf-8'
              }, */
      // data: requireData,
      success: function(response) {
        const resultData = JSON.parse(
          response
            .replace(/\r/g, '')
            .replace(/\n/g, '')
            .replace(/\s*/g, '')
        )
        const username = resultData[0].ID
        const password = resultData[0].Unique
        _that.$store
          .dispatch('LoginByMSL', { username: username, password: password })
          .then(() => {
            _that.$router.push({ path: _that.tagWel.value })
          })
      },
      error: function(XMLHttpRequest, textStatus, errorThrown) {
        console.error('访问马上聊出错')
      }
    })
  },
  // mounted() {
  //   const _that = this
  //   $.ajax({
  //     type: 'get',
  //     url: 'http://127.0.0.1:15211/LocalUnique',
  //     /* headers: {
  //               'Content-Type': 'text/xml;charset=utf-8'
  //             }, */
  //     // data: requireData,
  //     success: function(response) {
  //       const resultData = JSON.parse(
  //         response
  //           .replace(/\r/g, '')
  //           .replace(/\n/g, '')
  //           .replace(/\s*/g, '')
  //       )
  //       const username = resultData[0].ID
  //       const password = resultData[0].Unique
  //       _that.$store
  //         .dispatch('LoginByMSL', { username: username, password: password })
  //         .then(() => {
  //           _that.$router.push({ path: _that.tagWel.value })
  //         })
  //     },
  //     error: function(XMLHttpRequest, textStatus, errorThrown) {
  //       console.error('访问马上聊出错')
  //     }
  //   })
  // },
  computed: {
    ...mapGetters(['website', 'tagWel'])
  },

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

@@ -377,6 +377,7 @@
                this.$emit('refreshDataList')
              })
            }
            this.isSubmit = false
          } else {
            this.isSubmit = false
          }

 src/views/basic/company/index.vue

@@ -11,7 +11,10 @@
        :ajaxFun="ajaxFun"
        ref="companyTable"
      >
        <template #toolbar></template>
        <template #toolbar>
            <el-button type='primary' @click="addOrUpdateHandle"
            v-if="permissions.basic_company_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>
@@ -73,13 +76,7 @@
            {minWidth:'120',prop: "createTime",label:"创建时间",sort: true,isTrue:true,isSearch:true,searchInfoType:'datetimerange'},

          ],
          toolbar: [
            {
              text: '新增',
              type: 'primary',
              fun: this.addOrUpdateHandle
            }
          ],
          toolbar: [],
          operator:[
            {
              text: '删除',
@@ -109,6 +106,10 @@
    },
    methods: {
      hello(){
        if(!this.permissions.basic_company_copy){
          this.$message.error("该角色没有操作权限")
          return
        }
        if(this.multipleSelection.length < 1){
          this.$message.error("请先选择要复制的数据!")
          return
@@ -123,6 +124,10 @@
      },
      // 新增 /修改
      addOrUpdateHandle(row) {
        if(!this.permissions.basic_company_edit && row.id!=null){
          this.$message.error("该角色没有操作权限")
          return
        }
        this.addOrUpdateVisible = true
        this.$nextTick(() => {
          this.$refs.addOrUpdate.init(row==null?null:row.id)
@@ -130,6 +135,10 @@
      },
      // 删除公司信息
      deleteHandle(row) {
        if(!this.permissions.basic_company_del){
          this.$message.error("该角色没有操作权限")
          return
        }
        this.$confirm('是否确认删除公司名为:"'+row.companyName+'"', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',

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

@@ -90,6 +90,7 @@
              this.$emit('refreshDataList')
            })
          }
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/crew/index.vue

@@ -12,7 +12,10 @@
            :ajaxFun="ajaxFun"
            ref="crewTable"
          >
            <template #toolbar></template>
            <template #toolbar>
              <el-button type="primary" @click="addOrUpdateHandle"
              v-if="permissions.basic_crew_add">新增</el-button>
            </template>
          </ttable>
        </el-col>
        <el-col :span="16">
@@ -25,7 +28,10 @@
            :paramObj="paramObj"
            ref="staffTable"
          >
            <template #toolbar></template>
            <template #toolbar>
              <el-button type="primary" @click="addHandle"
              v-if="permissions.basic_crew_person_add"></el-button>
            </template>
          </ttable>
        </el-col>
        <!-- 弹窗, 新增 / 修改 -->
@@ -105,13 +111,7 @@
            render: { fun: this.addOrUpdateHandle }
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -124,8 +124,8 @@
        operatorConfig: {
          fixed: 'right',
          label: '操作',
          width: 100,
          minWidth: 100
          width: 110,
          minWidth: 110
        }
      },
      crewId: null,
@@ -270,13 +270,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '添加',
            type: 'primary',
            fun: this.addHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -309,6 +303,9 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_crew_edit && row.id!=null){
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -354,6 +351,10 @@
      }
    },
    deleteStaff(row) {
      if(!this.permissions.basic_crew_person_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      var newStaffList = []
      newStaffList.push(row)
      this.crewList = { id: this.crewId, staffList: newStaffList }
@@ -365,6 +366,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_crew_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除班次名称为：' + row.crewName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/basic/customizeparamtemplatetype/index.vue

@@ -8,7 +8,10 @@
        :ajaxFun="ajaxFun"
        ref="paramTemplateTypeTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_templatetyperelation_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -24,6 +27,7 @@
import { remote } from '@/api/admin/dict'
import ttable from '@/views/common/ztt-table.vue'
import TableForm from './templatetype-form'
import { mapGetters } from 'vuex'

export default {
  data() {
@@ -87,13 +91,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -113,6 +111,9 @@
      dataTypeList: []
    }
  },
  computed:{
    ...mapGetters(['permissions'])
  },
  components: {
    ttable,
    TableForm
@@ -123,6 +124,10 @@
  methods: {
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_templatetyperelation_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -130,6 +135,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_templatetyperelation_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除类型名称为' + row.templateTypeName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -179,6 +179,7 @@
            }
            this.isSubmit = false
          })
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/division/index.vue

@@ -11,7 +11,10 @@
        :ajaxFun="ajaxFun"
        ref="divisionTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_division_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -154,13 +157,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -192,6 +189,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_division_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -199,6 +200,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_division_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除部门名称为：' + row.divisionName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -171,6 +171,7 @@
            }
            this.isSubmit = false
          })
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/factory/index.vue

@@ -11,7 +11,10 @@
        :ajaxFun="ajaxFun"
        ref="factoryTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_factory_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -146,13 +149,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -184,6 +181,9 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_factory_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -191,6 +191,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_factory_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除工厂名称为：' + row.factoryName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/basic/location/index.vue

@@ -11,7 +11,10 @@
        :ajaxFun="ajaxFun"
        ref="locationTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_location_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -206,13 +209,7 @@
            searchInfoType: 'text'
          } */
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -351,6 +348,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_location_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -358,6 +359,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_location_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除库位号为' + row.locNo, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -31,14 +31,14 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
        <!-- <el-col :span="12">
          <el-form-item label="父节点类型" prop="pType">
            <el-input
              v-model="dataForm.pType"
              placeholder="父节点类型"
            ></el-input>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
      <el-row>
        <el-col :span="12">

 src/views/basic/param/index.vue

@@ -10,7 +10,10 @@
        :ajaxFun="ajaxFun"
        ref="paramTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.technology_param_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -148,13 +151,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -191,6 +188,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_param_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -218,6 +219,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_param_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除编号为' + row.code, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/basic/part/index.vue

@@ -12,7 +12,12 @@
        :ajaxFun="ajaxFun"
        ref="partTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_part_add">新增</el-button>
          <el-button type="primary" @click="() => (this.syncDateVisible = true)"
          v-if="permissions.basic_part_mdm">同步MDM</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -392,17 +397,6 @@
          } */
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          },
          {
            text: '同步MDM',
            type: 'primary',
            fun: () => (this.syncDateVisible = true),
            loading: false
          }
          // {
          //   text: '大标签',
          //   type: 'primary',
@@ -447,6 +441,7 @@
    PrintLabelForm
  },
  created() {
    this.uploadInfo.isShow = this.permissions.basic_part_upload
    this.table.column.find((e) => e.label === 'IFS启用批次管理').isTrue = false
    this.table.column.find((e) => e.label === '计划方法').isTrue = false
    this.getCategoryType('category')
@@ -470,6 +465,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_part_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -477,6 +476,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_part_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认零件名为:' + row.partName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -31,6 +31,7 @@
        </el-col>
        <el-col :span="12">
          <el-form-item label="名称" prop="partName">
            <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
            <el-input
              v-model="dataForm.partName"
              placeholder="零件名称"
@@ -42,6 +43,7 @@
                @click="openPartDialog()"
              ></el-button> -->
            </el-input>
            </el-tooltip>
          </el-form-item>
        </el-col>
      </el-row>
@@ -362,10 +364,12 @@
      <el-row>
        <el-col :span="12">
          <el-form-item label="备注" prop="description">
            <el-tooltip class="item" effect="dark" :content="dataForm.description" >
            <el-input
              v-model="dataForm.description"
              placeholder="备注"
            ></el-input>
            </el-tooltip>
          </el-form-item>
        </el-col>
      </el-row>

 src/views/basic/post/index.vue

@@ -13,7 +13,10 @@
            :ajaxFun="ajaxFun"
            ref="partFamilyTable"
          >
            <template #toolbar></template>
            <template #toolbar>
              <el-button @click="addOrUpdateHandle" type="primary"
              v-if="permissions.basic_post_add">新增</el-button>
            </template>
          </ttable>
        </el-col>
        <el-col :span="12" style="padding-left: 10px">
@@ -115,13 +118,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -212,6 +209,9 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_post_edit && row.id!=null){
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -219,6 +219,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_staff_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除编号为' + row.postNo, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -101,6 +101,7 @@
              this.$emit('refreshDataList')
            })
          }
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/shift/index.vue

@@ -11,7 +11,10 @@
        :ajaxFun="ajaxFun"
        ref="shiftTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_shift_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>
@@ -58,13 +61,7 @@
          column: [
            {minWidth:'140',prop:"name",label:"班次",sort: true,isTrue:true,isSearch:true,searchInfoType:'text',render:{fun:this.addOrUpdateHandle}}
          ],
          toolbar: [
            {
              text: '新增',
              type: 'primary',
              fun: this.addOrUpdateHandle
            }
          ],
          toolbar: [],
          operator: [
            {
              text: '删除',
@@ -97,6 +94,10 @@
      },
      // 新增 / 修改
      addOrUpdateHandle(row) {
        if(!this.permissions.basic_shift_edit && row.id!=null){
          this.$message.error("该角色没有操作权限")
          return
        }
        this.addOrUpdateVisible = true
        this.$nextTick(() => {
          this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -104,6 +105,10 @@
      },
      // 删除
      deleteHandle(row) {
        if(!this.permissions.basic_shift_del){
          this.$message.error("该角色没有操作权限")
          return
        }
        this.$confirm('是否确认删除班次名称为：' + row.name, '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',

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

@@ -366,6 +366,7 @@
              this.$emit('refreshDataList')
            })
          }
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/staff/index.vue

@@ -10,7 +10,10 @@
        :ajaxFun="ajaxFun"
        ref="staffTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_staff_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -207,13 +210,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -237,7 +234,7 @@
    ttable
  },
  computed: {
    ...mapGetters(['permissions'])
    ...mapGetters(['permissions']),
  },
  methods: {
    // 获取数据列表
@@ -246,6 +243,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_staff_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -253,6 +254,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_staff_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除人员名称为：' + row.staffName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -284,6 +289,7 @@
    }
  },
  created() {
    this.uploadInfo.isShow = this.permissions.basic_staff_upload
    this.initPersonNatureSelect()
  }
}

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

@@ -248,6 +248,7 @@
            }
            this.isSubmit = false
          })
          this.isSubmit = false
        } else {
          this.isSubmit = false
        }

 src/views/basic/template/index.vue

@@ -12,7 +12,10 @@
            :ajaxFun="ajaxFun"
            ref="templateTable"
          >
            <template #toolbar></template>
            <template #toolbar>
              <el-button type="primary" @click="addOrUpdateHandle"
              v-if="permissions.technology_operationtemplate_add">新增</el-button>
            </template>
          </ttable>
        </el-col>
        <el-col :span="12" style="padding-left: 10px">
@@ -26,6 +29,7 @@
                  <el-button
                    style="float: right; padding: 3px 0"
                    type="text"
                    v-if="permissions.technology_operationtemplate_param_add"
                    @click="relateOperationParam()"
                    >添加</el-button
                  >
@@ -107,7 +111,8 @@

              <el-table-column label="单位" prop="unit" align="center">
              </el-table-column>
              <el-table-column label="操作" align="center">
              <el-table-column label="操作" align="center" 
              v-if="permissions.technology_operationtemplate_param_edit">
                <template slot-scope="scope">
                  <el-button
                    type="text"
@@ -261,13 +266,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -306,6 +305,9 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_operationtemplate_edit && row.id!=null){
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -430,6 +432,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_operationtemplate_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除模板编号为' + row.templateNo, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/basic/warehouse/index.vue

@@ -11,7 +11,10 @@
        :ajaxFun="ajaxFun"
        ref="wareHouseTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_warehouse_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -177,13 +180,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -259,6 +256,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_warehouse_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -266,6 +267,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.basic_warehouse_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除仓库名称为' + row.warehouseName, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/basic/workstation/index.vue

@@ -10,7 +10,10 @@
        :ajaxFun="ajaxFun"
        ref="workstationTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.basic_workstation_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -121,13 +124,7 @@
            searchInfoType: 'text'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -188,6 +185,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.basic_workstation_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.addOrUpdateVisible = true
      this.$nextTick(() => {
        this.$refs.addOrUpdate.init(row == null ? null : row.id)
@@ -195,6 +196,10 @@
    },
    // 删除工作站点
    deleteHandle(row) {
      if(!this.permissions.basic_workstation_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除工作站为' + row.name, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

 src/views/plan/customerorder/index.vue

@@ -414,7 +414,6 @@
            width: '100px',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',

 src/views/plan/productionschedul/index.vue

@@ -165,6 +165,10 @@
        pagerCount: 5
      },
      option: {
        defaultSort:{
          prop:'id',
          order:'descending'
        },
        height: 400,
        selection: true,
        columnBtn: false,
@@ -305,11 +309,11 @@
    this.loading = true
    this.getData()
    this.getParamType()
    this.rowSort()
    // this.rowSort()
    this.rowCalc()
  },
  beforeUpdate() {
    this.rowSort()
    // this.rowSort()
    this.rowCalc()
  },
  watch:{
@@ -513,7 +517,7 @@
        ele.span = this.rowSpan(ele.prop, parent)
      })
    },
    rowSort(list) {
    rowSort() {
      let propList = this.spanArr.map(ele => ele.prop)
      this.spanArr.forEach((ele, index) => {
        let key = ele.prop

 src/views/technology/operation/index.vue

@@ -10,7 +10,10 @@
        :ajaxFun="ajaxFun"
        ref="operationTable"
      >
        <template #toolbar></template>
        <template #toolbar>
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.technology_operation_add">新增</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <table-form
@@ -220,13 +223,7 @@
            searchInfoType: 'datetimerange'
          }
        ],
        toolbar: [
          {
            text: '新增',
            type: 'primary',
            fun: this.addOrUpdateHandle
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -271,6 +268,10 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_operation_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'operationForm',
        params: { id: row == null ? null : row.id }
@@ -278,6 +279,10 @@
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_operation_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除编号为' + row.operationNo, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -657,7 +657,8 @@
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
      templateDefaultObj: { dataType: '生产要求' },
      // templateDefaultObj: { dataType: '生产要求' },
      templateDefaultObj: {},
      paramSelArr: [],
      paramSelCol: 'code',
      operationIndex: null,
@@ -681,6 +682,7 @@
        routingNo: null,
        name: null,
        partId: null,
        partNo: null,
        partName: null,
        description: null,
        state: null,
@@ -700,7 +702,7 @@
      dataRule: {
        partNo: [
          { required: true, message: '零件不能为空', trigger: 'blur' }
        ],
        ], 
        bomTypeDb: [
          { required: true, message: '工艺类型不能为空', trigger: 'change' }
        ],

 src/views/technology/structure/index.vue

@@ -13,13 +13,13 @@
        ref="structureTable"
      >
        <template #toolbar>
          <!-- <el-button type="primary" :loading="ifsSynsLoading" @click="syncIfs"
            >ERP同步</el-button
          > -->
          <el-button type="primary" @click="addOrUpdateHandle"
          v-if="permissions.technology_structure_add">新增</el-button>
          <el-button type="primary" @click="copyStructure"
          v-if="permissions.technology_structure_copy">复制</el-button>
        </template>
      </ttable>
      <!-- 弹窗, 新增 / 修改 -->
      <!--<table-form v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getData"></table-form>-->
      <el-dialog
        title="导入"
        :visible.sync="importStructureVisible"
@@ -230,22 +230,7 @@
            noShowTip: false
          }
        ],
        toolbar: [
          {
            text: '新增',
            // icon: 'el-icon-plus',
            type: 'primary',
            fun: this.addOrUpdateHandle,
            disabled: false,
            permitArr: []
          },
          {
            text: '复制',
            fun: this.copyStructure,
            disabled: false,
            permitArr: []
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
@@ -313,6 +298,7 @@
    this.getData()
  },
  created() {
    this.uploadInfo.isShow = this.permissions.technology_structure_upload
    this.table.column.find((e) => e.label === '已同步至ERP').isTrue = false
    this.getBomTypeDbOptions()
  },
@@ -332,14 +318,21 @@
    },
    // 新增 / 修改
    addOrUpdateHandle(row) {
      if(!this.permissions.technology_structure_edit && row.id!=null){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$router.push({
        name: 'singleStructureForm',
        params: { id: row == null ? null : row.id }
      })
      // this.$router.push({name:"structureForm",query:{id:row==null?null:row.id}})
    },
    // 删除
    deleteHandle(row) {
      if(!this.permissions.technology_structure_del){
        this.$message.error("该角色没有操作权限")
        return
      }
      this.$confirm('是否确认删除ID为' + row.id, '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',

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

@@ -39,13 +39,15 @@
                </el-input>
              </el-form-item>
              <el-form-item label="零件名称" prop="partName">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input
                  v-model="dataForm.partName"
                  placeholder="零件名称"
                  style="width: 150px"
                  style="width: 100%"
                  :readonly="true"
                >
                </el-input>
                </el-tooltip>
              </el-form-item>
              <el-form-item label="备注" prop="remark">
                <el-input

 vue.config.js

@@ -7,10 +7,13 @@

const url = 'http://192.168.2.7:9999'
// const url = 'http://192.168.32.45:9999'

// const url = 'http://192.168.2.7:9999'
const url = 'http://192.168.32.45:9999'
//const url = 'http://192.168.2.7:9999'
//const url = 'http://192.168.32.45:9999'
// const url = 'http://192.168.0.23:9999'

// const url = 'http://localhost:9999'
const url = 'http://localhost:9999'


const localUrl = 'http://localhost:8089'