车间订单客户附件bug解决

zss

2023-11-17 103b4575556d8c18a5707c162099070b82640554

车间订单客户附件bug解决

 src/api/plan/manufacturingorder.js

@@ -80,6 +80,14 @@
  })
}

export function getProcessConfigFile(obj) {
  return request({
    url: '/mes/plan/customerOrder/processConfigFiles',
    method: 'get',
    params: obj
  })
}

export function checkOutTechnologyRouting(query) {
  return request({
    url: '/mes/plan/manufacturingOrder/checkout',

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

@@ -1299,9 +1299,6 @@
      this.getConfigFiles()
    },
    delProcessConfigFile(row) {
      if (row.lineNumber !== this.dataForm.otcLineNo) {
        this.$message.error('上传文件行号与当前销售订单行号不一致，不允许删除')
      } else {
        this.$confirm('是否删除工艺配置文件', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
@@ -1314,7 +1311,6 @@
          .then((data) => {
            this.getConfigFiles()
          })
      }
    },
    downloadProcessConfigFile(row) {
      downloadProcessConfigFile(

 src/views/plan/manufacturingorder/customerorder.vue

@@ -22,18 +22,18 @@
        @keyup.enter.native="dataFormSubmit()"
        label-width="100px"
        class="l-mes productorder-order"
        :disabled="!editable"
      >
        <el-tabs type="border-card">
      <!-- :disabled="!editable" -->
        <el-tabs type="border-card" @tab-click="downs" v-model="activeFileName">
          <el-tab-pane label="主要" type="card">
            <el-row>
              <el-col :span="12">
                <el-form-item label="同步数据来源" prop="sourceId">
                  <el-input
                    v-model="dataForm.sourceId"
                    placeholder=""
                    :disabled="!ediSource"
                  ></el-input>
                 <el-input
                  v-model="dataForm.sourceId == 0 ? '同步' : '手动'"
                  placeholder=""
                  disabled
                ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -86,7 +86,7 @@
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
              <!-- <el-col :span="12">
                <el-form-item label="行号" prop="coLineNo">
                  <el-input
                    v-model="dataForm.coLineNo"
@@ -94,7 +94,17 @@
                    :disabled="!ediSource"
                  ></el-input>
                </el-form-item>
              </el-col>
              </el-col> -->
               <el-col :span="6">
              <el-form-item label="产品名称" prop="productName">
                <el-input
                  v-model="dataForm.productName"
                  placeholder=""
                  disabled
                >
                </el-input>
              </el-form-item>
            </el-col>
            </el-row>
            <el-row>
              <el-col :span="12">
@@ -121,9 +131,9 @@
            </el-row>
            <el-row>
              <el-col :span="12">
                <el-form-item label="期望交货时间" prop="wantedDeliveryDate">
                <el-form-item label="期望交货时间" prop="deliveryDate">
                  <el-date-picker
                    v-model="dataForm.wantedDeliveryDate"
                    v-model="dataForm.deliveryDate"
                    style="width: 100%"
                    type="datetime"
                    value-format="yyyy-MM-dd HH:mm:ss"
@@ -132,7 +142,16 @@
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
               <el-col :span="12">
                <el-form-item label="工艺文件名称" prop="docName">
                  <el-input
                    v-model="dataForm.docName"
                  placeholder=""
                  disabled
                  ></el-input>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item label="计划交货时间" prop="plannedDeliveryDate">
                  <el-date-picker
                    v-model="dataForm.plannedDeliveryDate"
@@ -143,13 +162,37 @@
                  >
                  </el-date-picker>
                </el-form-item>
              </el-col>
              </el-col> -->
            </el-row>
            <el-card
            <el-row>
            <el-col :span="24">
              <el-form-item label="订单备注" prop="comment">
                <el-input
                   v-model="dataForm.comment"
                    placeholder=""
                    :disabled="!ediSource"
                >
                </el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item label="产品备注" prop="remark">
                <el-input
                 v-model="dataForm.remark"
                    placeholder=""
                    :disabled="!ediSource"
                >
                </el-input>
              </el-form-item>
            </el-col>
          </el-row>
            <!-- <el-card
              header="订单参数"
              shadow="never"
              class="productorder-order-param"
            >
            > -->
              <el-row>
                <el-form-item
                  style="float:left;width: 50%"
@@ -166,8 +209,33 @@
              </el-row>
            </el-card>
          </el-tab-pane>
          <el-tab-pane label="附件" type="card">
          <el-tab-pane label="附件" type="card" name="附件">
            <div style="display: flex;justify-content:flex-end;">
            <div></div>
          </div>
          <div
            v-loading="progrecessFileLoading"
            element-loading-text="请稍等，文件上传中"
          >
            <el-upload
              drag
              ref="upload"
              action="/mes/plan/customerOrder/upload"
              :auto-upload="true"
              :headers="headers"
              :before-upload="submitUpload"
              :on-success="uploadSuccess"
              :data="paramData"
              :with-credentials="true"
              :show-file-list="false"
            >
              <i class="el-icon-upload"></i>
              <div class="el-upload__text">
                将文件拖到此处，或<em>点击上传</em>
              </div>
            </el-upload>
          </div>
            <!-- <el-upload
              disabled
              action=""
              ref="upload"
@@ -176,10 +244,93 @@
              :on-preview="handlePreview"
              :with-credentials="true"
            >
            </el-upload>
            </el-upload> -->
            <el-table :data="processConfigFileTableData" height="400px">
            <el-table-column
              prop="orderNumber"
              align="center"
              label="订单号"
              show-overflow-tooltip
            >
            </el-table-column>
            <!-- <el-table-column prop="lineNumber" align="center" label="行号"> -->
            <!-- </el-table-column> -->
            <el-table-column
              prop="originalFileName"
              align="center"
              label="原文件名"
              width="200"
            >
            </el-table-column>
            <el-table-column prop="fileName" align="center" label="文件后缀">
            </el-table-column>
            <el-table-column prop="createUser" align="center" label="上传人">
            </el-table-column>
            <el-table-column
              prop="createTime"
              align="center"
              label="上传时间"
              show-overflow-tooltip
            >
            </el-table-column>
            <el-table-column prop="updateUser" align="center" label="更新人">
            </el-table-column>
            <el-table-column
              prop="updateTime"
              align="center"
              label="更新时间"
              show-overflow-tooltip
            >
            </el-table-column>
            <!--            <el-table-column align="center" label="是否同步工艺配置单">-->
            <!--              <template slot-scope="scope">-->
            <!--                <el-switch-->
            <!--                  :value="scope.row.effectiveRange"-->
            <!--                  active-value="1"-->
            <!--                  inactive-value="0"-->
            <!--                  @input="handleInput(scope.row)"-->
            <!--                  :disabled="scope.row.lineNumber !== dataForm.otcLineNo"-->
            <!--                />-->
            <!--              </template>-->
            <!--            </el-table-column>-->
            <el-table-column fixed="right" align="center" label="操作">
              <template slot-scope="scope">
                <!-- <el-button
                  @click="synchronizeFile(scope.row)"
                  type="text"
                  size="small"
                  :disabled="scope.row.lineNumber !== dataForm.customerNo"
                  >同步</el-button
                > -->
                <el-button
                  @click="delProcessConfigFile(scope.row)"
                  type="text"
                  size="small"
                  :disabled="scope.row.lineNumber !== dataForm.customerNo"
                  >删除</el-button
                >
                <el-button
                  @click="downloadProcessConfigFile(scope.row)"
                  type="text"
                  size="small"
                  >下载</el-button
                >
              </template>
            </el-table-column>
          </el-table>
          </el-tab-pane>
        </el-tabs>
      </el-form>
      <span slot="footer" class="dialog-footer">
      <el-button @click="visible = false">取消</el-button>
      <el-button
        type="primary"
        :disabled="buttonDisable"
        v-thinclick="`dataFormSubmit`"
        v-if="editable"
        >确定</el-button
      >
    </span>
    </el-tab-pane>
  </el-tabs>
</template>
@@ -196,11 +347,14 @@
  addCustomerOrder,
  download,
  getCustomerOrder,
  deleteProcessConfigFile,
  downloadProcessConfigFile,
  putCustomerOrder
} from '@/api/plan/customerorder'
import { remote } from '@/api/admin/dict'
import { validateSixDecimal } from '@/util/validate'
import { getCustomer } from '../../../api/plan/manufacturingorder'
import { getStore } from '@/util/store'
import { getCustomer,getProcessConfigFile } from '../../../api/plan/manufacturingorder'

export default {
  props: {
@@ -277,37 +431,71 @@
          { validator: validateSixDecimal, trigger: 'blur' }
        ]
      },
      paramData: {
        // range: '1',
        orderNumber: '',
        lineNumber: ''
      },
      headers: {
        Authorization: 'Bearer ' + getStore({ name: 'access_token' })
      },
      units: [],
      coStates: [
        // {
        //   value: '01plan',
        //   label: '待计划'
        // },
        // {
        //   value: '03planed',
        //   label: '已计划'
        // },
        // {
        //   value: '02planing',
        //   label: '计划中'
        // },
        // {
        //   value: '04complete',
        //   label: '已完成'
        // }
         {
          value: '01partUnCheck',
          label: '零件待选'
        },
        {
          value: '01plan',
          value: '02technologyUnCheck',
          label: '工艺文件待选'
        },
        {
          value: '03plan',
          label: '待计划'
        },
        {
          value: '03planed',
          label: '已计划'
          value: '04planed',
          label: '已下发'
        },
        {
          value: '02planing',
          label: '计划中'
          value: '05cancel',
          label: '已作废'
        },
        {
          value: '04complete',
          label: '已完成'
          value: '06unedit',
          label: '订单编辑'
        }
      ]
      ],
      processConfigFileTableData: [],
      activeFileName: ""
    }
  },
  computed: {
    editable: function() {
      if (!this.dataForm.id) {
        return true
      }
      if (this.dataForm.id && this.dataForm.coState !== '04complete') {
        return true
      }
      return false
    },
    // editable: function() {
    //   if (!this.dataForm.id) {
    //     return true
    //   }
    //   if (this.dataForm.id && this.dataForm.coState !== '04complete') {
    //     return true
    //   }
    //   return false
    // },
    ediSource: function() {
      if (!this.dataForm.id) {
        return true
@@ -360,8 +548,8 @@
            }
            this.fileList = response.data.data.customerOrderAttachmentList
            this.orderParamList = response.data.data.orderParamList
            
            
            //附件
            this.processConfigFileTableData = response.data.data.configFiles
            this.title =
              this.dataForm.customerName + this.dataForm.customerOrderNo
          })
@@ -371,6 +559,48 @@
          this.$refs.tabs.currentName = '0'
        }
      })
    },
    submitUpload() {
      this.paramData.orderNumber = this.dataForm.contractNo
      this.paramData.lineNumber = this.dataForm.customerNo
      this.progrecessFileLoading = true
    },
    uploadSuccess() {
      this.progrecessFileLoading = false
      this.downs()
    },
    //附件的查询
    downs(label, e){
      if(this.activeFileName=='附件'){
        console.log('1');
        getProcessConfigFile({
          orderNumber: this.dataForm.contractNo,
          lineNumber: this.dataForm.customerNo
        }).then((res)=>{
          this.processConfigFileTableData = res.data.data
        })
      }
    },
    downloadProcessConfigFile(row) {
      downloadProcessConfigFile(
        row.fileName,
        row.bucketName,
        row.originalFileName
      )
    },
    delProcessConfigFile(row) {
        this.$confirm('是否删除工艺配置文件', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning',
          closeOnClickModal: false
        })
          .then(function() {
            return deleteProcessConfigFile(row.id)
          })
          .then((data) => {
            this.downs()
          })
    },
    // 附件的点击
    handlePreview(file) {
@@ -425,6 +655,9 @@
    },
    handleTabClick(tab, event) {
      this.init(parseInt(tab.name))
      if(tab.name){

      }
    },
    // 零件选择
    openPartDialog() {

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -638,17 +638,11 @@
                </el-row>
                <el-row>
                  <el-table
                    default-expand-all
                    :data="components"
                    :data="components[0]"
                    @selection-change="structSelectionChange"
                    row-key="id"
                    border
                    :tree-props="{
                      children: 'children'
                    }"
                    style="width: 100%"
                    height="400px"
                    :default-sort="{ prop: 'index' }"
                  >
                    <el-table-column type="selection" width="40" fixed="left" />
                    <el-table-column
@@ -1071,6 +1065,7 @@

  data() {
    return {
      componentsTable:[],
      typeOptions: [],
      paramTemplateSelArr: [],
      paramTemplateSelCol: 'operationTemplateNo',
@@ -1232,6 +1227,7 @@
    this.getBomTypeDbOptions()
    this.getManufactureAttrs('manufacture_attr_type')
    this.getSysParam(sysParam.IS_REPORT_OPERATION)
    // console.log(this.components);
  },
  watch: {
    'dataForm.partId'(newValue, oldValue) {
@@ -1245,7 +1241,11 @@
        }
      }
    },

    components(newVal,oldVal){
      console.log("新",newVal);
      console.log("老",oldVal);
      console.log(this.components);
    },
    currentRouting(newValue, oldValue) {
      if (newValue && newValue.id) {
        if (this.dataForm.id != null && this.dataForm.id !== 0) {
@@ -1295,7 +1295,8 @@
      if (newValue && newValue.id) {
        // 查询产品结构对应的组件
        getBom(newValue.id).then((response) => {
          this.components = [response.data.data.tree]
          console.log("查",this.components);
          // this.components = [response.data.data.tree]
        })
      }
    },
@@ -1397,6 +1398,7 @@
    },
    // 查询当前车间订单信息
    getOrderInfo() {
      let that=this
      getManufacturingOrder(this.dataForm.id).then((response) => {
        this.dataForm = response.data.data
        // 把工艺挂上去
@@ -1416,7 +1418,7 @@
        }
        // 把产品结构组件挂上去
        if (this.dataForm.bomRoot) {
          this.components = [this.dataForm.bomRoot]
          that.components = [this.dataForm.bomRoot]
        }
      })
    },

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

@@ -134,6 +134,7 @@
            <el-table-column label="零件名称" prop="partName"></el-table-column>
            <el-table-column label="单位" prop="unit"></el-table-column>
            <el-table-column label="数量" prop="qpa"></el-table-column>
            <el-table-column label="盘数" prop="discNum"></el-table-column>
          </el-table>
          <!-- <el-table
            class="tree-select-table"