优化页面代码提交

2 years ago · a6fce272c9
parent aa7e48cf0c
commit a6fce272c9
9 changed files with 78 additions and 10 deletions
--- a/src/api/supplier/supProductsAddDi.js
+++ b/src/api/supplier/supProductsAddDi.js
@ -40,3 +40,11 @@ export function getDiProductDetail(query) {
    })
 }

+export function gupdateDiProductDetail(query) {
+  return axios({
+    url: "/udiwms/thrsys/updateThrAddDiProductsList",
+    method: "post",
+    data: query
+  })
+}
+
--- a/src/views/basic/product/productUdiType.vue
+++ b/src/views/basic/product/productUdiType.vue
@ -13,7 +13,6 @@
          <el-button-group style="margin-left: 10px;display:flex;">
            <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
            <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
-            <el-button type="primary" icon="el-icon-plus" @click="handleSubForm( pCode, 'add')">新增</el-button>
          </el-button-group>
        </el-form-item>
      </el-form>
@ -31,6 +30,7 @@
        <el-table-column prop="code" label="编码"></el-table-column>
        <el-table-column label="操作" class-name="small-padding fixed-width">
          <template slot-scope="scope">
+            <el-button type="text"  @click="handleSubForm( scope.row, 'add')">新增</el-button>
            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleSubForm( scope.row, 'edit')">编辑</el-button>
            <el-button type="text" v-if="scope.row.code!=10000" @click.native.stop="handleDelInv(scope.row)">删除</el-button>
            <el-button type="text" v-if="scope.row.code!=10000"  @click.native.stop="addHospProduct( scope.row)">绑定</el-button>
@ -53,6 +53,7 @@
            <el-col :span="12" class="el-col">
              <el-form-item label="上级菜单" prop="parentCode">
                <treeselect
+                  :disabled="formName=='add'"
                  v-model="subData.parentCode"
                  :options="fromDeptOptions"
                  :normalizer="normalizer"
@ -154,8 +155,8 @@ export default {
      isExpandAll: true,
      total: 0,
      formMap: {
-        add: "新增",
-        edit: "编辑"
+        add: "新增物资字典分类",
+        edit: "编辑物资字典分类"
      },
      formName: null,
      configParms: {},
@ -220,8 +221,7 @@ export default {
      if (formName === "edit") {
        this.subData = JSON.parse(JSON.stringify(data));
      } else if (formName === "add") {
-        this.subData.parentCode = JSON.parse(JSON.stringify(this.pCode));
-        this.subData={};
+        this.subData.parentCode = JSON.parse(JSON.stringify(data)).code;
      }
      this.getTreeselect();
      this.subFormVisible = true;
--- a/src/views/inout/DialogSelectProduct.vue
+++ b/src/views/inout/DialogSelectProduct.vue
@ -301,6 +301,7 @@ export default {
    },

    combine() {
+      debugger
      let data = {
        relId: this.currentRow.rlId,
        supId: this.currentRow.customerId,
--- a/src/views/purchase/cert/supCertAudit.vue
+++ b/src/views/purchase/cert/supCertAudit.vue
@ -562,6 +562,7 @@ export default {

    supCompanyClick(row) {
      this.filterManufacturerQuery.customerId = row.customerId;
+      this.registrationList=[];
      this.onManufacturerReset();
    },

--- a/src/views/purchase/company/supCompanyAduditDialog.vue
+++ b/src/views/purchase/company/supCompanyAduditDialog.vue
@ -656,7 +656,7 @@ export default {
    ,
    printSupCert(row) {
      var selectIds = [row.id];
-      let query = {moduleId: 8};
+      let query = {id: 1};
      this.loading = true;
      verifyTemplateFile(query).then((res) => {
        if (res.code === 20000) {
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@ -801,7 +801,7 @@ export default {
    },
    printSupCert(row) {
      var selectIds = [row.id];
-      let query = {moduleId: 9};
+      let query = {id: 2};
      this.loading = true;
      verifyTemplateFile(query).then((res) => {
        if (res.code === 20000) {
--- a/src/views/purchase/product/supProductAuditDialog.vue
+++ b/src/views/purchase/product/supProductAuditDialog.vue
@ -775,7 +775,7 @@ export default {
    },
    printSupCert(row) {
      var selectIds=[row.id];
-      let query = {moduleId: 10};
+      let query = {id: 3};
      this.loading = true;
      verifyTemplateFile(query).then((res) => {
        if (res.code === 20000) {
--- a/src/views/supplier/products/selectDIDetailDialog.vue
+++ b/src/views/supplier/products/selectDIDetailDialog.vue
@ -18,6 +18,54 @@
                </el-col>
              </el-row>

+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="商品条码:">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.sptm"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="医保编码:">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm" @input="change($event)"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="计量单位:">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.measname"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="生产企业:">
+                    <el-input style="width: 90%" size="small" :disabled="true" v-model="editQuery.manufactory" splaceholder="请输入内容" @input="change($event)"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="商品名称:">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.spmc"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="产品描述:">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容"   v-model="editQuery.cpms"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+              <el-row>
+                <el-col :span="12" class="el-col">
+                  <el-form-item label="产品价格:">
+                    <el-input style="width: 90%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01" v-model="editQuery.price"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+
                <el-collapse v-model="activeNames">
                    <el-collapse-item name="1">
                        <template slot="title">
--- a/src/views/supplier/products/supDiProductsCheck.vue
+++ b/src/views/supplier/products/supDiProductsCheck.vue
@ -64,6 +64,7 @@
          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
        <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
        <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" @click="acts">全部审核</el-button>
      </el-button-group>
      </div>

@ -157,7 +158,7 @@ import {
  getThrDiProducts,
  delThrDiProducts,
  getDiProductDetail,
-  updateDiProduct
+  updateDiProduct, gupdateDiProductDetail
 } from '@/api/supplier/supProductsAddDi'
 import selectDiDetail from '@/views/supplier/products/selectDIDetailDialog'
 import ThrProductsAdd from '@/views/supplier/products/supProductsAdd'
@ -237,6 +238,15 @@ export default {
      this.filterQuery.page = 1
      this.getList()
    },
+    acts(){
+      gupdateDiProductDetail().then((res) => {
+        if (res.code === 20000) {
+
+        } else {
+          this.$message.error('参数错误')
+        }
+      })
+    },
    getList() {
      this.loading = true
      getThrDiProducts(this.filterQuery)
@ -286,7 +296,7 @@ export default {
      if(type==1){
        this.title="产品信息详情"
      }else{
-        this.title="产品信息审核"
+        this.title="物资入院审核"
      }

      if(row.type==1){