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

duhe

昨天 60480a72558b3d64e483dcf89457fde4f3c1c31f

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

 .env.development

@@ -10,7 +10,7 @@
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#锦隆
# VUE_APP_BASE_API = 'http://192.168.1.11/API/'
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 = http://localhost:8082/API/

 .env.production

@@ -5,11 +5,11 @@
ENV = 'production'

# 宁波 四维尔
# VUE_APP_BASE_API = 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://192.168.1.11/API/
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 智云迈思L-MOM管理系统/生产环境
# VUE_APP_BASE_API = http://47.96.97.237/API/
#杜贺

 src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue

@@ -184,6 +184,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
          </div>
          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -265,6 +266,8 @@
    <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
    </el-dialog>
    <!-- 容器库存 -->
    <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
  </div>
</template>

@@ -278,11 +281,12 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ICInventoryMould from '@/views/component/ICInventory_Mould'               //容器库存组件
import moment from 'moment';

export default {
  name: 'Sc_MouldInRequestBillEdit',
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ICInventoryMould },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -322,6 +326,7 @@
      organizationList: [],//组织列表
      subDisabled: false,//编辑页面保存按钮是否禁用(true禁用，false可用)
      // OperationType: this.$route.query.OperationType,//保存类型（新增1修改2）
      ICInventoryMouldShow:false, //容器库存组件显示标记
      HInterID: 0,
      baseURL: process.env.VUE_APP_BASE_API,
      checkedSysZb: [],
@@ -889,6 +894,21 @@
        this.$refs.zbTable.toggleRowSelection(del_row, false) //设置这一行取消选中
      }
    },
    
    //#region 查看容器库存
    get_ICInventoryMould(zbSelForm) {
      if (!this.zbIndex) {
        this.$modal.msgError("请选择一行数据")
      } else {
        var index = zbSelForm.index-1;
        this.ICInventoryMouldShow = true
        this.$nextTick(() => {
          this.$refs.ICInventoryMould.open(this.editData[index]);
        })
      }
    },
    //#endregion
    
    // 编辑提交保存
    submitForm() {
      this.$refs["form"].validate(valid => {

 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue

@@ -201,6 +201,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
          </div>
          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -315,6 +316,8 @@
    <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
    </el-dialog>
    <!-- 容器库存 -->
    <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
  </div>
</template>

@@ -328,11 +331,12 @@
import GyCustomer from '@/views/GyCustomer'
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ICInventoryMould from '@/views/component/ICInventory_Mould'               //容器库存组件
import moment from 'moment';

export default {
  name: 'Sc_MouldMoveStockRequestBillEdit',
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ICInventoryMould},
  props: {
    OperationType: { type: Number, },//操作类型（1新增、2编辑、3复制、4下推）
    linterid: { type: Number, },
@@ -372,6 +376,7 @@
      organizationList: [],//组织列表
      subDisabled: false,//编辑页面保存按钮是否禁用(true禁用，false可用)
      // OperationType: this.$route.query.OperationType,//保存类型（新增1修改2）
      ICInventoryMouldShow:false, //容器库存组件显示标记
      HInterID: 0,
      baseURL: process.env.VUE_APP_BASE_API,
      checkedSysZb: [],
@@ -989,6 +994,21 @@
        this.$refs.zbTable.toggleRowSelection(del_row, false) //设置这一行取消选中
      }
    },
    
    //#region 查看容器库存
    get_ICInventoryMould(zbSelForm) {
      if (!this.zbIndex) {
        this.$modal.msgError("请选择一行数据")
      } else {
        var index = zbSelForm.index-1;
        this.ICInventoryMouldShow = true
        this.$nextTick(() => {
          this.$refs.ICInventoryMould.open(this.editData[index]);
        })
      }
    },
    //#endregion
    
    // 编辑提交保存
    submitForm() {
      this.$refs["form"].validate(valid => {

 src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue

@@ -201,6 +201,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
          </div>
          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -288,6 +289,8 @@
    <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
    </el-dialog>
    <!-- 容器库存 -->
    <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
  </div>
</template>

@@ -302,11 +305,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
import ICInventoryMould from '@/views/component/ICInventory_Mould'               //容器库存组件
import moment from 'moment';

export default {
  name: 'Sc_MouldOutRequestBillEdit',
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList },
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScICMOBillList,ICInventoryMould },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -348,6 +352,7 @@
      organizationList: [],//组织列表
      subDisabled: false,//编辑页面保存按钮是否禁用(true禁用，false可用)
      // OperationType: this.$route.query.OperationType,//保存类型（新增1修改2）
      ICInventoryMouldShow:false, //容器库存组件显示标记
      HInterID: 0,
      baseURL: process.env.VUE_APP_BASE_API,
      checkedSysZb: [],
@@ -982,6 +987,21 @@
        this.$refs.zbTable.toggleRowSelection(del_row, false) //设置这一行取消选中
      }
    },
    
    //#region 查看容器库存
    get_ICInventoryMould(zbSelForm) {
      if (!this.zbIndex) {
        this.$modal.msgError("请选择一行数据")
      } else {
        var index = zbSelForm.index-1;
        this.ICInventoryMouldShow = true
        this.$nextTick(() => {
          this.$refs.ICInventoryMould.open(this.editData[index]);
        })
      }
    },
    //#endregion
    
    // 编辑提交保存
    submitForm() {
      this.$refs["form"].validate(valid => {

 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue

@@ -206,6 +206,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
          </div>
          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -361,6 +362,8 @@
    <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
    </el-dialog>
    <!-- 容器库存 -->
    <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
  </div>
</template>

@@ -375,11 +378,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import scMouldIn from '@/views/scMould/warehouse/component/Sc_MouldInRequestBill.vue'
import ICInventoryMould from '@/views/component/ICInventory_Mould'               //容器库存组件
import moment from 'moment';

export default {
  name: 'Sc_MouldProdBackBillEdit',
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn },
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,scMouldIn,ICInventoryMould },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -422,6 +426,7 @@
      ifOrganizationEdit: false,
      subDisabled: false,//编辑页面保存按钮是否禁用(true禁用，false可用)
      // OperationType: this.$route.query.OperationType,//保存类型（新增1修改3）
      ICInventoryMouldShow:false, //容器库存组件显示标记
      HInterID: 0,
      baseURL: process.env.VUE_APP_BASE_API,
      checkedSysZb: [],
@@ -1133,6 +1138,21 @@
        this.$refs.zbTable.toggleRowSelection(del_row, false) //设置这一行取消选中
      }
    },
    
    //#region 查看容器库存
    get_ICInventoryMould(zbSelForm) {
      if (!this.zbIndex) {
        this.$modal.msgError("请选择一行数据")
      } else {
        var index = zbSelForm.index-1;
        this.ICInventoryMouldShow = true
        this.$nextTick(() => {
          this.$refs.ICInventoryMould.open(this.editData[index]);
        })
      }
    },
    //#endregion
    
    // 编辑提交保存
    submitForm() {
      this.$refs["form"].validate(valid => {

 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue

@@ -223,6 +223,7 @@
              size="mini">上移</el-button>
            <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
              size="mini">下移</el-button>
            <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
          </div>
          <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
            @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
@@ -400,6 +401,8 @@
    <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
    </el-dialog>
    <!-- 容器库存 -->
    <ICInventoryMould :visible.sync="ICInventoryMouldShow" ref="ICInventoryMould"/>
  </div>
</template>

@@ -414,11 +417,12 @@
import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import ScMouldMove from '@/views/scMould/warehouse/component/Sc_MouldMoveStockRequestBill.vue'
import ICInventoryMould from '@/views/component/ICInventory_Mould'               //容器库存组件
import moment from 'moment';

export default {
  name: 'Sc_MouldProdMoveBillEdit',
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove },
  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace,ScMouldMove,ICInventoryMould },
  props: {
    OperationType: { type: Number, },//（1新增、2编辑、3复制、4下推）
    linterid: { type: Number, },
@@ -462,6 +466,7 @@
      ifOrganizationEdit: false,
      subDisabled: false,//编辑页面保存按钮是否禁用(true禁用，false可用)
      // OperationType: this.$route.query.OperationType,//保存类型（1新增、2编辑、3复制、4下推）
      ICInventoryMouldShow:false, //容器库存组件显示标记
      HInterID: 0,
      baseURL: process.env.VUE_APP_BASE_API,
      checkedSysZb: [],
@@ -1210,6 +1215,21 @@
        this.$refs.zbTable.toggleRowSelection(del_row, false) //设置这一行取消选中
      }
    },
    
    //#region 查看容器库存
    get_ICInventoryMould(zbSelForm) {
      if (!this.zbIndex) {
        this.$modal.msgError("请选择一行数据")
      } else {
        var index = zbSelForm.index-1;
        this.ICInventoryMouldShow = true
        this.$nextTick(() => {
          this.$refs.ICInventoryMould.open(this.editData[index]);
        })
      }
    },
    //#endregion
    
    // 编辑提交保存
    submitForm() {
      this.$refs["form"].validate(valid => {

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue

@@ -291,13 +291,13 @@
    },
    async created() {
        await this.loging();                                            //自动登录
        this.judgeIsLoging();                                           //判断是否登录，未登录则跳转回登录页面
        await this.judgeIsLoging();                                           //判断是否登录，未登录则跳转回登录页面
        await this.get_OrganizationList();                              //页面初始化 获取组织下拉列表数据
        await this.initPageData();                                      //页面初始化
    },
    methods: {
        //#region 判断是否登录，未登录则跳转回登录页面
        judgeIsLoging(){
        async judgeIsLoging(){
            if (sessionStorage["login"] != "login") {
                this.$modal.msgError("登录失效，请重新登录！！");
                this.$router.push({ path: "/" }).catch(() => { })
@@ -306,7 +306,7 @@
        //#endregion

        //#region 页面初始化
        initPageData(){
        async initPageData(){
            var params = this.get_UrlVars();
            var OperationType = params[params[0]];      //操作类型

@@ -729,11 +729,11 @@

            if (HOrgID == 0) {
                //判断是否登录 未登录则跳到登录页
                if (sessionStorage.login != "login") {
                    this.$modal.msgError("登录失效，请重新登录！!");
                    this.$router.push({ path: "/" }).catch(() => { })
                }
                return;
                // if (sessionStorage.login != "login") {
                //     this.$modal.msgError("登录失效，请重新登录！!");
                //     this.$router.push({ path: "/" }).catch(() => { })
                // }
                // return;
            }

            var sql_getHOrgName = "select HName from Xt_Organizations where HItemID = " + HOrgID;
@@ -763,6 +763,8 @@
                this.$router.push({ path: "/" }).catch(() => { })
            });


            // 写入sessionStorage 需要时间，后续操作需要等待 写入sessionStorage完成后再执行
            var sql_login = "select * from h_v_Gy_Czygl_Login where Czymc = '" + HUserName + "'";
            axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
                params: { 
@@ -819,6 +821,11 @@
                        sessionStorage["Organization"] = HOrgName;
                        sessionStorage["HTranSlate"] = "1";
                        sessionStorage["HAutoLogin"] = "1";

                        // 添加一个延时，保证写入sessionStorage完成后再调用后续业务代码
                        setTimeout(() => {
                            
                        }, 1000);
                    } else {
                        this.$modal.msgError("加载失败！！账号不存在，请联系管理员维护账号信息！！");
                        this.$router.push({ path: "/" }).catch(() => { });