Merge remote-tracking branch 'origin/master'

zss

2023-11-17 2518e47a3ac999978fbf14612c967c3bbf421d25

Merge remote-tracking branch 'origin/master'

 src/api/plan/customerorder.js

@@ -383,7 +383,23 @@
// 作废
export function dropByContractNo(contractNo) {
  return request({
    url: '/mes/plan/customerOrder/dropByContractNo/' + contractNo,
    method: 'get'
    url: '/mes/plan/customerOrder/dropByContractNo',
    method: 'get',
    params: contractNo
  })
}

export function chooseStaff() {
  return request({
    url: '/mes/plan/customerOrder/chooseStaff',
    method: 'get',
  })
}

export function updateCustomerOrderById(obj) {
  return request({
    url: '/mes/plan/customerOrder/updateById',
    method: 'put',
    data: obj
  })
}

 src/const/crud/customerOrder/customerOrderForm.js

@@ -69,13 +69,6 @@
    minWidth: 200,
    span: 24
  }, {
    label: '隶属品牌',
    prop: 'productType',
    cell: true,
    type: 'input',
    minWidth: 200,
    span: 24
  }, {
    label: '单位',
    prop: 'otcUnit',
    slot: true,

 src/views/basic/log/index.vue

@@ -35,6 +35,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in documentTagArr"
                :disabled="item.disabled"

 src/views/plan/customerorder/customerorder-form.vue

@@ -71,9 +71,9 @@
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="客户订单状态" prop="returnStatus">
              <el-form-item label="客户订单状态" prop="coState">
                <el-input
                v-model="dataForm.returnStatus"
                v-model="dataForm.coState"
                  placeholder=""
                  filterable
                  style="width: 100%"
@@ -156,12 +156,12 @@
                  placeholder=""
                  disabled
                >
                  <el-button
                  <!-- <el-button
                    slot="append"
                    icon="el-icon-search"
                    @click="openSalesPartDialog()"
                    v-show="dataForm.id"
                  ></el-button>
                  ></el-button> -->
                </el-input>
              </el-form-item>
            </el-col>
@@ -909,6 +909,13 @@
                )
              }
            }
            let val=""
            this.coStates.forEach(item=>{
              if(item.value==this.dataForm.coState){
                val=item.label
              }
            })
            this.dataForm.coState=val
          })
        } else {
          this.title = '新增'
@@ -916,6 +923,7 @@
        }
      })
    },
    
    getFileList() {
      this.fileList = []
      const queryParam = { orderNumber: this.dataForm.contractNo }
@@ -972,25 +980,21 @@
      this.$refs.dataForm.validate((valid) => {
        if (valid) {
          if (this.dataForm.id) {
            updateCustomerOrderById(this.dataForm)
              .then((data) => {
            updateCustomerOrderById(this.dataForm).then((data) => {
                this.$message.success('修改成功')
                this.visible = false
                this.buttonDisable = false
                this.$emit('refreshDataList', 1)
              })
              .catch((error) => {
              }).catch((error) => {
                this.buttonDisable = false
              })
          } else {
            addCustomerOrder(this.dataForm)
              .then((data) => {
            addCustomerOrder(this.dataForm).then((data) => {
                this.$message.success('添加成功')
                this.visible = false
                this.buttonDisable = false
                this.$emit('refreshDataList', 1)
              })
              .catch((error) => {
              }).catch((error) => {
                this.buttonDisable = false
              })
          }
@@ -1099,10 +1103,23 @@
      this.getConfigFiles()
    },
    delProcessConfigFile(row) {
      if (row.lineNumber !== this.dataForm.otcLineNo) {
        this.$message.error('上传文件行号与当前销售订单行号不一致，不允许删除')
      } else {
        this.$confirm('是否删除工艺配置文件', '提示', {
      // if (row.lineNumber !== this.dataForm.otcLineNo) {
      //   this.$message.error('上传文件行号与当前销售订单行号不一致，不允许删除')
      // } else {
      //   this.$confirm('是否删除工艺配置文件', '提示', {
      //     confirmButtonText: '确定',
      //     cancelButtonText: '取消',
      //     type: 'warning',
      //     closeOnClickModal: false
      //   })
      //     .then(function() {
      //       return deleteProcessConfigFile(row.id)
      //     })
      //     .then((data) => {
      //       this.getConfigFiles()
      //     })
      // }
      this.$confirm('是否删除工艺配置文件', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning',
@@ -1114,7 +1131,6 @@
          .then((data) => {
            this.getConfigFiles()
          })
      }
    },
    downloadProcessConfigFile(row) {
      downloadProcessConfigFile(

 src/views/plan/customerorder/index.vue

@@ -445,7 +445,7 @@
          {
            minWidth: '100',
            width: '100px',
            prop: 'customerOrderNo',
            prop: 'contractNo',
            label: '合同编号',
            sort: true,
            isTrue: true,
@@ -841,7 +841,7 @@
    }
    if (this.permissions.customerorder_submit_oa) {
      this.table.toolbar.push({
        text: '提交审核',
        text: '提交OA审核',
        type: 'primary',
        fun: this.auditCustomerOrder,
        disabled: false,
@@ -1113,7 +1113,7 @@
    },
    // 作废
    cancelHandle(row) {
      this.$confirm('是否确认作废销售订单号为' + row.id + '提示', {
      this.$confirm('确认作废销售订单号为【' + row.contractNo + '】的数据?','提示' , {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        closeOnClickModal: false,
@@ -1127,22 +1127,7 @@
            this.$message.error('作废失败')
          }
        })
      })
      // .then(() => {
      //   markPlanned([row.id], '05cancel').then((response) => {
      //     var data = response.data
      //     if (data.code === 0) {
      //       this.$message.success('作废成功')
      //       this.getData()
      //     } else {
      //       this.$message.error('作废失败')
      //     }
      //   })
      // })
      // .then((data) => {
      //   this.$message.success('作废成功')
      //   this.getData()
      // })
      }).catch(()=>{ })
    },
    // 删除
    deleteHandle(row) {

 src/views/plan/customerorder/sample-customerorder-form.vue

@@ -68,8 +68,8 @@
        <el-row>
          <el-col :span="6">
            <el-form-item label="业务员" prop="salesMan">
              <el-select @change="selsctionSales" v-model="salesSelectData" style="width:100%">
                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item" :label="item.staffName"/>
              <el-select @change="selsctionSales" filterable v-model="salesSelectData" style="width:100%">
                <el-option v-for="(item,index) in staffOptions" :key="index" :value="item.staffNo+','+item.staffName" :label="item.staffName"/>
              </el-select>
            </el-form-item>
          </el-col>
@@ -391,7 +391,7 @@
import PartDialog from '@/views/common/part.vue'
import { validateSixDecimal } from '@/util/validate'
import {dateFormat} from '@/util/date'
// import { chooseStaff } from '@/api/admin/productType'
import { chooseStaff } from '@/api/plan/customerorder'
import { tableOption } from '@/const/crud/customerOrder/customerOrderForm'

export default {
@@ -477,13 +477,16 @@
      this.tableData.splice(index,1)
    },
    selsctionSales(data){
        this.dataForm.salesMan =  data.staffName
        this.dataForm.salerWorkCode = data.staffNo
        if(data){
          let arr = data.split(",")
          this.dataForm.salesMan =  arr[1]
          this.dataForm.salerWorkCode = arr[0]
        }
    },
    getStaffOptions(){
      // chooseStaff().then((response)=>{
      //   this.staffOptions = response.data.data
      // })
      chooseStaff().then((response)=>{
        this.staffOptions = response.data.data
      })
    },
    init(id) {
      this.initDataForm()
@@ -555,6 +558,10 @@
        this.tableData[index].partNo = part.partNo
        this.tableData[index].customerPartSpec = part.specs
        this.tableData[index].productName = part.partName
        this.tableData[index].otcUnit = part.unit
        this.tableData[index].buyQtyDue = part.numCount
        this.tableData[index].manufactureAttr = part.materialAttribute

      }
    },
    // 全屏

 src/views/plan/customerorder/schedule-table.vue

@@ -84,15 +84,16 @@
            label="本次计划数量"
          >
            <template scope="scope">
              <el-form-item
              <el-form-item>{{ scope.row.qtyPlaned }}</el-form-item>
              <!-- <el-form-item
                :prop="'customer.' + scope.$index"
                :rules="rules.qtyPlaned"
              >
                <el-input
                  v-model="scope.row.qtyPlaned"
                  placeholder="请输入本次计划数量"
                ></el-input>
              </el-form-item>
                ></el-input> -->
              <!-- </el-form-item> -->
            </template>
          </el-table-column>
          <el-table-column
@@ -224,6 +225,9 @@
          customerList.push(item)
        })
        this.dataForm.customer = JSON.parse(JSON.stringify(customerList))
        this.dataForm.customer.forEach(item=>{
            item.qtyPlaned=item.buyQtyDue
        })
      })
    },
    dataFormSubmit() {

 src/views/plan/manufacturingorder/index.vue

@@ -22,6 +22,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in taskTypeArr"
                :disabled="canCreateTask"
@@ -40,6 +41,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in stateTagArr"
                :disabled="item.disabled"

 src/views/plan/masterproductionschedule/auto-manufacturingorder.vue

@@ -251,7 +251,7 @@
                    unit: item.unit,
                    workShop: null,
                    workshopTypeCode: 'M',
                    requiredDate: null,
                    requiredDate: this.masterProduction.requiredDate,
                    id: item.id,
                    manufactureAttr: this.masterProduction.manufactureAttr,
                    isReportOperation: this.isReportOperation

 src/views/plan/masterproductionschedule/index.vue

@@ -9,7 +9,7 @@
              车间订单<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in orderTypeArr" :disabled="item.disabled">{{
              <el-dropdown-item :key="item" :command="item.command" v-for="item in orderTypeArr" :disabled="item.disabled">{{
                item.label }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
@@ -20,7 +20,7 @@
              状态改变<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in stateTagArr" :disabled="item.disabled">{{
              <el-dropdown-item :key="item" :command="item.command" v-for="item in stateTagArr" :disabled="item.disabled">{{
                item.label }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
@@ -31,7 +31,7 @@
              工艺文件<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in documentTagArr" :disabled="item.disabled">
              <el-dropdown-item :key="item" :command="item.command" v-for="item in documentTagArr" :disabled="item.disabled">
                {{ item.label }}
              </el-dropdown-item>
            </el-dropdown-menu>
@@ -43,7 +43,7 @@
              审核状态改变<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
              <el-dropdown-item :key="item" :command="item.command" v-for="item in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
          <el-button v-if="permissions.masterproductionschedule_submit_oa" @click="commitOa()" type="primary"
@@ -62,12 +62,12 @@
            type="primary"
            style="margin-left:10px;"
            >SCM状态变更
          </el-button>
          </el-button> -->
          <el-button
            type="primary"
            style="margin-left:10px;"
            >新增采购计划
          </el-button> -->
          </el-button>
        </template>
      </ttable>

@@ -486,33 +486,33 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '140',
            prop: 'outerColor',
            label: '外护颜色',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '140',
            prop: 'lengthRequirement',
            label: '盘长要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '140',
            prop: 'printRequirement',
            label: '印字要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '140',
          //   prop: 'outerColor',
          //   label: '外护颜色',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '140',
          //   prop: 'lengthRequirement',
          //   label: '盘长要求',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '140',
          //   prop: 'printRequirement',
          //   label: '印字要求',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '140',
            prop: 'orderRemark',

 src/views/plan/mpsrequirements/index.vue

@@ -18,6 +18,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in stateTagArr"
                :disabled="item.disabled"

 src/views/plan/operationtask/index.vue

@@ -21,6 +21,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in stateTagArr"
                :disabled="item.disabled"

 src/views/plan/outsourcingorder/index.vue

@@ -21,9 +21,9 @@
                  <template v-for="item in stateTagArr">
                    <el-dropdown-item
                      :command="item.command"
                      :disabled="item.disabled"
                      >{{ item.eventName }}</el-dropdown-item
                    >
                      :disabled="item.disabled">
                      {{ item.eventName }}
                    </el-dropdown-item>
                  </template>
                </el-dropdown-menu>
              </el-dropdown>
@@ -33,7 +33,7 @@
                </el-button>
                <el-dropdown-menu slot="dropdown">
                  <template v-for="item in oaStateTagArr">
                    <el-dropdown-item :command="item.command" v-if="item.isShow"
                    <el-dropdown-item :key="item" :command="item.command" v-if="item.isShow"
                      >{{ item.eventName }}
                    </el-dropdown-item>
                  </template>

 src/views/quality/report/index.vue

@@ -81,10 +81,11 @@
                      </el-button>
                      <el-dropdown-menu slot="dropdown">
                        <el-dropdown-item
                          :key="item"
                          :command="item.ref"
                          v-for="item in toolbarIsQualified"
                          :disabled="item.disabled"
                          v-if="item.isShow"
                          v-show="item.isShow"
                          >{{ item.text }}
                        </el-dropdown-item>
                      </el-dropdown-menu>