Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/scMould/basicModeling/Gy_MouldFile.vue

@@ -5,7 +5,7 @@
      <el-button type="primary" @click="close">退 出</el-button>
      <!-- <el-button @click="cancel">取 消</el-button> -->
    </div>
    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">器具档案编辑</div>
    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">容器档案编辑</div>
    <el-form ref="form" :model="form" :rules="rules" label-width="140px">
      <el-tabs v-model="activeName" type="card">
        <el-tab-pane label="基本信息" name="first">
@@ -30,25 +30,25 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具编号" prop="HMouldNo" v-show="isShow">
                <el-input v-model="form.HMouldNo" placeholder="请输入器具编号" />
              <el-form-item label="容器编号" prop="HMouldNo" v-show="isShow">
                <el-input v-model="form.HMouldNo" placeholder="请输入容器编号" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="器具名称" prop="HName" v-show="isShow">
                <el-input v-model="form.HName" placeholder="请输入器具名称" />
              <el-form-item label="容器名称" prop="HName" v-show="isShow">
                <el-input v-model="form.HName" placeholder="请输入容器名称" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具规格" prop="HModel" v-show="isShow">
                <el-input v-model="form.HModel" placeholder="请输入器具规格" />
              <el-form-item label="容器规格" prop="HModel" v-show="isShow">
                <el-input v-model="form.HModel" placeholder="请输入容器规格" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具型号" prop="HModel2" v-show="isShow">
                <el-input v-model="form.HModel2" placeholder="请输入器具型号" />
              <el-form-item label="容器型号" prop="HModel2" v-show="isShow">
                <el-input v-model="form.HModel2" placeholder="请输入容器型号" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -88,16 +88,16 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具分类" prop="HMouleTypeName" v-show="isHide">
                <el-input v-model="form.HMouleTypeName" placeholder="请输入器具分类" disabled>
              <el-form-item label="容器分类" prop="HMouleTypeName" v-show="isHide">
                <el-input v-model="form.HMouleTypeName" placeholder="请输入容器分类" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="单位" prop="HUnitName" v-show="isHide">
              <el-form-item label="单位" prop="HUnitName" v-show="isShow">
                <el-input v-model="form.HUnitName" placeholder="请输入单位" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                  <el-button slot="append" icon="el-icon-search"  @click="openDataDialog(11)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -129,7 +129,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具状态" prop="HMouldStatus" v-show="isHide">
              <el-form-item label="容器状态" prop="HMouldStatus" v-show="isHide">
                <el-select v-model="form.HMouldStatus" placeholder="请选择">
                  <el-option label="在库" value="在库" />
                  <el-option label="上机" value="上机" />
@@ -232,14 +232,14 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具类型" prop="HMouldClass" v-show="isHide">
              <el-form-item label="容器类型" prop="HMouldClass" v-show="isHide">
                <el-select v-model="form.HMouldClass" placeholder="请选择">
                  <el-option label="模具" value="模具" />
                  <el-option label="工装" value="工装" />
                  <el-option label="夹具" value="夹具" />
                  <el-option label="刀具" value="刀具" />
                  <el-option label="检具" value="检具" />
                  <el-option label="周转器具" value="周转器具" />
                  <el-option label="周转容器" value="周转容器" />
                  <el-option label="其他" value="其他" />
                </el-select>
              </el-form-item>
@@ -266,21 +266,12 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="器具可用状态" prop="HMouldUseStatus" v-show="isHide">
              <el-form-item label="容器可用状态" prop="HMouldUseStatus" v-show="isHide">
                <el-select v-model="form.HMouldUseStatus" placeholder="请选择">
                  <el-option label="正常" value="正常" />
                  <el-option label="异常" value="异常" />
                  <el-option label="保养" value="保养" />
                  <el-option label="维修" value="维修" />
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="使用组织" prop="HCREATEORGID" v-show="isShow">
                <el-select v-model="form.HCREATEORGID" placeholder="请选择组织使用" @change="organizationChange"
                  :disabled="zzSelDis">
                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
                  </el-option>
                </el-select>
              </el-form-item>
            </el-col>
@@ -300,22 +291,33 @@
              <el-form-item label="高" prop="HMouldHeight" v-show="isShow">
                <el-input v-model="form.HMouldHeight" placeholder="请输入高" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
            </el-col>           
          </el-row>
          <el-row>
             <el-col :span="6">
              <el-form-item label="折叠高度" prop="HMouldFoldHeight" v-show="isShow">
                <el-input v-model="form.HMouldFoldHeight" placeholder="请输入折叠高度" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="6">
              <el-form-item label="周转容器标记" prop="HTransPackFlag" v-show="isShow">
                <el-checkbox v-model="form.HTransPackFlag"></el-checkbox>
              <el-form-item label="" prop="HTransPackFlag" v-show="isShow">
                <el-checkbox v-model="form.HTransPackFlag">周转容器标记</el-checkbox>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="发货容器标记" prop="HSendPackFlag" v-show="isShow">
                <el-checkbox v-model="form.HSendPackFlag"></el-checkbox>
              <el-form-item label="" prop="HSendPackFlag" v-show="isShow">
                <el-checkbox v-model="form.HSendPackFlag">发货容器标记</el-checkbox>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
             <el-col :span="6">
              <el-form-item label="使用组织" prop="HCREATEORGID" v-show="isShow">
                <el-select v-model="form.HCREATEORGID" placeholder="请选择组织使用" @change="organizationChange"
                  :disabled="zzSelDis">
                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
                  </el-option>
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>
@@ -387,7 +389,7 @@
        </el-tab-pane>
      </el-tabs>
      <el-tabs type="border-card" v-show="isHide">
        <el-tab-pane label="子器具">
        <el-tab-pane label="子容器">
          <div style="margin-bottom: 10px;">
            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'edit')"
              size="mini">增加一行</el-button>
@@ -398,7 +400,7 @@
            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
            <el-table-column type="selection" width="55" align="center" />
            <el-table-column align="center" label="序号" type="index" width="80" />
            <el-table-column align="center" label="子器具">
            <el-table-column align="center" label="子容器">
              <template slot-scope="scope">
                <el-input v-model="scope.row.HMouldFileName" />
              </template>
@@ -503,6 +505,7 @@
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
      <GyUnit @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyUnitShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -525,11 +528,12 @@
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyCustomer from '@/views/GyCustomer'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import GyUnit from '@/views/basic/gyUnit/gyUnit.vue'
import moment from 'moment';

export default {
  name: 'Gy_MouldFile',
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace },
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace,GyUnit },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -567,6 +571,7 @@
      gySupplierShow: false,
      gyCustomerShow: false,
      gyStockPlaceShow: false,
      gyUnitShow: false,
      deptform: {},//弹窗选中数据
      openData: false,//数据弹窗
      dialogTitle: '',
@@ -622,6 +627,7 @@
      form: {},
      // 表单校验
      rules: {
        HUnitName:[{required: true, message: "单位不能为空", trigger: "blur" }],
        // HSupName: [
        //   { required: true, message: "客户不能为空", trigger: "blur" }
        // ],
@@ -649,7 +655,7 @@
        var dataArray = [];
        for (var i = 0; i < data.length; i++) {
          // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
          axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
          axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
            params: {
              "HInterID": data[i].hmainid
              , "HSubID": data[i].hsubid
@@ -768,7 +774,7 @@
    },
    //根据主内码与子内码获取源单销售订单数据
    getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
      axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
      axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
        params: {
          "HInterID": HSourceInterID
          , "HSubID": HSourceEntryID
@@ -839,7 +845,6 @@
          this.gySupplierShow = false
          this.openData = false
        } else if (num == 7) {
          console.log(deptRow)
          this.form.HCusName = deptRow.客户名称
          this.form.HCusID = deptRow.HItemID
          this.gyCustomerShow = false
@@ -854,6 +859,12 @@
          }
          this.gyStockPlaceShow = false
          this.openData = false
        } else if (num == 11){
           this.form.HUnitName = deptRow.计量单位名称;
            this.form.HUnitID = deptRow.HItemID;
          this.gyUnitShow= false
          this.openData = false

        }
      } else {
        this.$modal.msgError("请选择单条数据!");
@@ -899,7 +910,7 @@
    },
    //根据用户获取对应职员、部门、销售主管
    getCzyglByUser() {
      axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
      axios.get(this.$baseUrl + '/Xs_SeOrderBill/getCzyglByUser', {
        params: { "CurUserName": sessionStorage["HUserName"] }
      }).then(response => {
        let dataForm = response.data.data[0]
@@ -960,7 +971,7 @@
        HMouldDotCheckRuleInterID: 0,
        HMouldMaintainRuleInterName: '',
        HMouldMaintainRuleInterID: 0,
        HBarCode: '',
        HBarCode: '1',
        HMadeSupID: 0,
        HMadeSupName: '',
        HMouldClass: '',
@@ -990,6 +1001,7 @@
        HDeleteDate: '',
        HInComDate: moment(new Date()).format('YYYY-MM-DD'),
        DateTime: moment(new Date()).format('YYYY-MM-DD'),
        HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
      }
      this.editData = []
      this.editBtData = []
@@ -1016,7 +1028,7 @@
      })
    },
    getHBillNo() {
      axios.get(this.baseURL + "/Web/GetMAXNum", {
      axios.get(this.$baseUrl + "/Web/GetMAXNum", {
        params: {
          HBillType: '3899'
        }
@@ -1030,7 +1042,7 @@
    },
    //获取对应的条码明细
    getBarCodeNoteBySellOutBill(rowHmainid) {
      axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
      axios.get(this.$baseUrl + '/Kf_SellOutBill/BarCodeNote', {
        params: { "HInterID": rowHmainid }
      }).then(response => {
        if (response.data.count == 1) {
@@ -1045,7 +1057,7 @@
    },
    //#region 根据客户获取客户余额
    getCustomerBalance(HCusID) {
      axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
      axios.get(this.$baseUrl + '/Xs_CusRatingChangeBill/getCustomerBalance', {
        params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
      }).then(response => {
        var data = response.data.data[0];
@@ -1060,9 +1072,10 @@
    handleUpdate() {
      this.reset()
      let rowHmainid = this.linterid
      axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
      axios.get(this.$baseUrl + "/Gy_Mould_Edit/xg", {
        params: { 'HInterID': rowHmainid }
      }).then(response => {
        console.log(response.data)
        if (response.data.count == 1) {
          var result = response.data
          var data = response.data.data[0]
@@ -1135,12 +1148,16 @@
          this.form.HMouldUseStatus = data.模具可用状态
          this.form.HNextMainDate = data.校正日期
          this.form.HUSEORGID = data.HUSEORGID
          this.form.HMouldLength = data.HMouldLength
          this.form.HMouldWidth = data.HMouldWidth
          this.form.HMouldHeight = data.HMouldHeight
          this.form.HMouldFoldHeight = data.HMouldFoldHeight
          this.form.HTransPackFlag = data.HTransPackFlag == 0 ? false : true
          this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
          // this.form.HMouldLength = data.HMouldLength
          // this.form.HMouldWidth = data.HMouldWidth
          // this.form.HMouldHeight = data.HMouldHeight
          // this.form.HMouldFoldHeight = data.HMouldFoldHeight
          this.form.HTransPackFlag = data.周转容器标记
          this.form.HSendPackFlag = data.发货容器标记
          this.form.HMouldFoldHeight = data.折叠高度
            this.form.HMouldLength = data.长
          this.form.HMouldWidth = data.宽
          this.form.HMouldHeight = data.高
          for (var i = 0; i < result.data.length; i++) {
            this.editData.push(
              {
@@ -1162,7 +1179,7 @@
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
      });
      axios.get(this.baseURL + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
      axios.get(this.$baseUrl + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
        params: { 'HInterID': rowHmainid }
      }).then(response => {
        if (response.data.code == 1) {
@@ -1206,7 +1223,7 @@
    },
    //#region 计算-下次保养/校正日期
    calculateHNextMainDate(HInterID, HCycleUnit, HCheckCycle) {
      axios.get(this.baseURL + "/Gy_Mould_Edit/calculateHNextMainDate", {
      axios.get(this.$baseUrl + "/Gy_Mould_Edit/calculateHNextMainDate", {
        params: { 'HInterID': HInterID }
      }).then(response => {
        let d = response.data
@@ -1240,7 +1257,7 @@
    },
    //根据客户带出联系人、联系电话
    getCustomerByCusID(HCusID) {
      axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
      axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
        params: {
          HCusID: HCusID
        }
@@ -1416,7 +1433,7 @@
      var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
      axios({
        method: 'get',
        url: this.baseURL + "/CommonModel/searchMethod",
        url: this.$baseUrl + "/CommonModel/searchMethod",
        params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
      }).then(response => {
        if (response.data.count == 1) {
@@ -1463,7 +1480,7 @@
          console.log(oMain)
          axios({
            method: 'post',
            url: this.baseURL + url,
            url: this.$baseUrl + url,
            data: {
              'oMain': oMain
            },
@@ -1495,6 +1512,7 @@
      this.gySupplierShow = false
      this.gyCustomerShow = false
      this.gyStockPlaceShow = false
      this.gyUnitShow= false
    },
    //  打开数据列表弹窗
    openDataDialog(num, row) {
@@ -1535,6 +1553,10 @@
        this.dialogTitle = '仓位列表'
        this.gyStockPlaceShow = true
        this.openData = true
      } else if (num == 11) {
        this.dialogTitle = '单位列表'
        this.gyUnitShow = true
        this.openData = true
      }
    },
  }