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

Fixiaobai

2023-11-14 21d976db1dcdf9ea4b6c300c159a654a7cd62b63

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

 src/views/common/ztt-table.vue

@@ -327,10 +327,11 @@
              <template v-else>
                <template v-if="!item.render">
                  <template v-if="item.formatter">
                    <span v-if="item.isTag">
                      <el-tag type="success">aaa</el-tag>
                    </span>
                    <div v-if="item.isTag" style="margin: 2px;text-align: center;">
                      <el-tag :type="scope.row[item.prop]==0?'success':'info'">{{item.formatter(scope.row, item, scope.row[item.prop])}}</el-tag>
                    </div>
                    <span
                      v-else
                      v-html="
                        item.formatter(scope.row, item, scope.row[item.prop])
                      "

 src/views/plan/customerorder/index.vue

@@ -342,6 +342,15 @@
      showCustomerorderReturn: false,
      scheduleVisible: false,
      showDocument: false,
      sourceIdList: [{
        label: '外部',
        value: '0',
        type: 'success',
      },{
        label: '内部',
        value: '1',
        type: ''
      }],
      stateTagArr: [
        {
          label: '标记零件待选',
@@ -661,18 +670,18 @@
        ],
        toolbar: [],
        operator: [
          {
            text: '订单说明',
            type: 'text',
            size: 'small',
            fun: this.openCustomerOrder
          },
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.stockHandle
          },
          // {
          //   text: '订单说明',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.openCustomerOrder
          // },
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.stockHandle
          // },
          {
            text: '作废',
            type: 'text',
@@ -692,7 +701,7 @@
        operatorConfig: {
          fixed: 'right',
          label: '操作',
          width: 260,
          width: 100,
          minWidth: 100
        }
      },
@@ -860,6 +869,14 @@
    }
  },
  methods: {
    getSourceId(row, column, cellValue) {
      this.sourceIdList.forEach((obj) => {
        if (obj.value === cellValue) {
          cellValue = obj.label
        }
      })
      return cellValue
    },
    getOtcPartSyncOptionList() {
      return this.otcPartSyncOptionList
    },
@@ -1353,10 +1370,10 @@
                  '存在销售订单已关联工艺文件，如需更改，请先解除关联'
                )
              }
              if (item.salesPartNo == null || item.salesPartNo === '') {
                status = true
                this.$message.error('存在销售订单未绑定销售件，请先绑定')
              }
              // if (item.salesPartNo == null || item.salesPartNo === '') {
              //   status = true
              //   this.$message.error('存在销售订单未绑定销售件，请先绑定')
              // }
              if (item.partNo != firstPartNo) {
                status = true
                this.$message.error('订单零件号不一致')