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

Fixiaobai

2023-11-15 6a496cd9a081b0f1ba869255e13316b66895dac5

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

 src/styles/variables.scss

@@ -2,7 +2,7 @@
$mainBg: #409eff;

/* 改变主题色变量 */
$--color-primary: #006eff;
$--color-primary: #875a7b;

/* 改变 icon 字体路径变量，必需 */
$--font-path: '~element-ui/lib/theme-chalk/fonts';

 src/views/plan/customerorder/index.vue

@@ -84,13 +84,13 @@
            @click="()=>exportDialogVisible=true"
            >导出台账</el-button
          >
          <el-button
          <!-- <el-button
            v-if="permissions.plan_customerorder_return"
            style="margin-left:10px;"
            type="primary"
            @click="returnOrder"
            >订单退回</el-button
          >
          > -->
        </template>
      </ttable>

@@ -449,7 +449,7 @@
          {
            minWidth: '100',
            width: '100px',
            prop: 'contractNo',
            prop: 'customerOrderNo',
            label: '合同编号',
            sort: true,
            isTrue: true,
@@ -1188,13 +1188,13 @@
    },
    // 作废
    cancelHandle(row) {
      this.$confirm('确认作废销售订单号为【' + row.contractNo + '】的数据?','提示' , {
      this.$confirm('确认作废id为【' + row.id + '】的数据?','提示' , {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        closeOnClickModal: false,
        type: 'warning'
      }).then(() => {
        dropByContractNo({contractNo:row.contractNo}).then((res) => {
        dropByContractNo({id:row.id}).then((res) => {
          if (res.data.code === 0) {
            this.$message.success('作废成功')
            this.getData()

 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>
@@ -489,8 +489,11 @@
  },
  methods: {
    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)=>{

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

@@ -155,7 +155,7 @@
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
            <!-- <el-table-column
              prop="isReportOperation"
              label="IFS车间订单接收时报告工序"
              align="center"
@@ -163,7 +163,7 @@
              <template slot-scope="scope">
                <span>{{ scope.row.isReportOperation ? '是' : '否' }}</span>
              </template>
            </el-table-column>
            </el-table-column> -->
          </el-table>
        </div>
      </div>
@@ -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
@@ -417,6 +417,7 @@
    },
    getWorkShopOptions() {
      remote('work_shop').then((response) => {
        console.log("高压",response);
        if (response.data.code === 0) {
          this.workShopOptions = response.data.data
        } else {

 src/views/plan/masterproductionschedule/index.vue

@@ -82,14 +82,14 @@
              >
            </el-dropdown-menu>
          </el-dropdown>
          <el-button
          <!-- <el-button
            v-if="permissions.masterproductionschedule_submit_oa"
            @click="commitOa()"
            type="primary"
            style="margin-left:10px;"
            :loading="loadingOa"
            >提交OA
          </el-button>
          </el-button> -->
          <!-- <el-button
            v-if="permissions.masterproductionschedule_sync_scm"
            @click="syncScm()"
@@ -690,18 +690,18 @@
      })
    }
    if (this.permissions.masterproductionschedule_create_outsourcing) {
      this.table.toolbar.push({
        text: '创建委外订单',
        fun: this.createOutsourcingOrder
      })
      // this.table.toolbar.push({
      //   text: '创建委外订单',
      //   fun: this.createOutsourcingOrder
      // })
    }
    if (this.permissions.masterproductionschedule_create_order_manual) {
      this.orderTypeArr.push({
        label: '手动新增',
        command: 'MANUAL',
        disabled: false,
        permitArr: ['02processed']
      })
      // this.orderTypeArr.push({
      //   label: '手动新增',
      //   command: 'MANUAL',
      //   disabled: false,
      //   permitArr: ['02processed']
      // })
    }
    if (this.permissions.masterproductionschedule_create_order_auto) {
      this.orderTypeArr.push({

 vue.config.js

@@ -4,7 +4,7 @@
 */
// const url = 'http://192.168.0.23:9999'

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

// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'