1

dytyqx

15 小时以前 a30b3f8e6d0735fdd240de585ae596abefe62317

1

 .env.development

@@ -6,7 +6,7 @@

# 智云迈思L-MOM管理系统/开发环境
# VUE_APP_BASE_API = http://localhost:81/API/
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://localhost:8082/API/'
@@ -14,8 +14,8 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 宁波 四维尔
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/
# 内网地址测试

 RuoYi-Vue

New file
@@ -0,0 +1 @@
Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814

 src/views/basic/gyCurrency/gyCurrency.vue

@@ -1177,12 +1177,17 @@
    //双击行
    handleDblclick(row, column, cell, event) {
      if (this.checkIsIframe()) {
        window.parent.iframeCarCallBack(row);
        window.parent.iframeCurrencyCallBack(row);
        return;
      }
      this.OperationType = 3;
      this.handleEdit(row, this.OperationType);
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 2)
      } else {
        this.handleEdit();
      }
    },
    
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}

 src/views/basic/gyCurrency/gyCurrencyEdit.vue

@@ -134,6 +134,18 @@
  },
  mounted() {
    this.user = sessionStorage["HUserName"] || "admin";
    this.fetchData();
    this.getdata();
    // 币别 回调
    window.iframeCurrencyCallBack = (info) => {
      // 回调赋值
      console.log(info);
      this.form.HCurID = info.HItemID;
      this.form.HCurName = info["货币名称"];
      this.form.HExRate = info["汇率"];
      // 关闭弹窗
      this.deptClose();
    };
  },
  methods: {
    // 检查是否在iframe中
@@ -147,6 +159,8 @@
      const hID = urlParams.HInterID ? parseInt(urlParams.HInterID) : 0;
      const opType = urlParams.OperationType ? parseInt(urlParams.OperationType) : 1;
      


      // 如果props没有传递，使用URL参数
      const operationType = this.OperationType || opType;
      const linterid = this.linterid || hID;

 src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue

@@ -86,7 +86,7 @@
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="结算方式" prop="HSSName" required>
              <el-form-item label="结算方式" prop="HSSName" >
                <el-input v-model="form.HSSName" placeholder="请选择结算方式" disabled>
                  <el-button
                    slot="append"
@@ -626,7 +626,7 @@
          HCurID: [{ required: true, message: "币别不能为空", trigger: "blur" }],
          HExRate: [{ required: true, message: "汇率不能为空", trigger: "blur" }],
          HSTOCKINORGID: [{ required: true, message: "组织不能为空", trigger: "change" }],
          HSSName: [{ required: true, message: "结算方式不能为空", trigger: "blur" }],
          // HSSName: [{ required: true, message: "结算方式不能为空", trigger: "blur" }],
      },
    };
  },
@@ -703,8 +703,8 @@
            this.form.HCurName = deptRow.货币名称;
            this.form.HCurID = deptRow.HItemID;
            this.form.HExRate = deptRow.汇率;
          this.CurrencyDialogShow = false;
          this.openData = false;
            this.CurrencyDialogShow = false;
            this.openData = false;
        } else if (num == 3) {
          console.log(deptRow);
          if(this.areaType==1)
@@ -1107,6 +1107,12 @@
    },
    // 编辑提交保存
    submitForm() {
      this.form.HSupID = this.form.HSupID || 0;
      this.form.HEmpID = this.form.HEmpID || 0;
      this.form.HDeptID = this.form.HDeptID || 0;
      this.form.HCurID = this.form.HCurID || 0;
      this.form.HExRate = this.form.HExRate || 1;
      this.form.HSSID = this.form.HSSID || 0;
      this.$refs["form"].validate((valid) => {
        if (valid) {
          let fhck = false;
@@ -1119,8 +1125,8 @@
          { field: 'HDeptID', name: '部门' },
          { field: 'HCurID', name: '币别' },
          { field: 'HExRate', name: '汇率' },
          { field: 'HSTOCKINORGID', name: '组织' },
          { field: 'HSSName', name: '结算方式' }
          { field: 'HSTOCKINORGID', name: '组织' }
          // { field: 'HSSName', name: '结算方式' }
        ];
          for (let i = 0; i < requiredFields.length; i++) {
            const field = requiredFields[i].field;

 src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue

@@ -22,7 +22,7 @@
      <el-form-item label-width="78px">
        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 搜 索</el-button>
        <el-button icon="el-icon-circle-close" @click="resetQuery">重 置</el-button>
        <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">重新同步</el-button>
        <!-- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">重新同步</el-button> -->
      </el-form-item>
      <el-collapse v-model="activeSeach">
        <el-collapse-item title="更多" name="1">

 src/views/component/CurrencyDialog/index.vue

@@ -596,18 +596,32 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3
      if (this.openPage) {
        if(this.openPage='Kf_StockOutRequestBill')
      {
        this.$emit('deptEmitDb', row, 10)
      if (this.checkIsIframe()) {
        window.parent.iframeCurrencyCallBack(row);
        return;
      }
      else
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 2)
        this.closeDialog();
      } else {
        this.handleEdit();
      }
    },
    // handleDblclick(row, column, cell, event) {
    //   this.OperationType = 3
    //   if (this.openPage) {
    //     if(this.openPage='Kf_StockOutRequestBill')
    //   {
    //     this.$emit('deptEmitDb', row, 10)
    //   }
    //   else{
    //     this.$emit('deptEmitDb', row, 2)
    //   }
    //   } else {
    //     this.handleEdit();
    //   }
    // },
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}