Merge branch 'master' of http://172.16.100.139/new-business/drp-web

src/api/material/basic.js

@@ -268,6 +268,66 @@ const medcineitemBatchSave = (data) => {
   })
 }
 
+// 修改财务信息 /dev-api/drp-admin/system/finance/edit 
+const financeEdit = (data) => {
+  return request({
+    url: `/system/finance/edit `,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改利润中心信息 /dev-api/drp-admin/system/center/edit
+const centerEdit = (data) => {
+  return request({
+    url: `/system/center/edit `,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改采购信息 /dev-api/drp-admin/system/purchase/edit
+const purchaseEdit = (data) => {
+  return request({
+    url: `/system/purchase/edit `,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改库存信息 /dev-api/drp-admin/system/inventory/edit
+const inventoryEdit = (data) => {
+  return request({
+    url: `/system/inventory/edit `,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改计划信息 /dev-api/drp-admin/system/plan/edit
+const planEdit = (data) => {
+  return request({
+    url: `/system/plan/edit `,
+    method: 'post',
+    data,
+  })
+}
+
+// 修改成本信息 /dev-api/drp-admin/system/cost/edit
+const costEdit = (data) => {
+  return request({
+    url: `/system/cost/edit `,
+    method: 'post',
+    data,
+  })
+}
+
+
+
+/*
+*导入导出
+*/
+
 // 导入文件  /dev-api/drp-admin/system/material/import
 const fileImport = (data) => {
   return request({
@@ -281,7 +341,7 @@ const fileImport = (data) => {
  * 删除接口
  */
 // 删除物料基本信息-列表   /dev-api/drp-admin/system/material/delete/{id}
-const delMaterial = (data)=>{
+const delMaterial = (data) => {
   return request({
     url: '/system/material/delete',
     method: 'post',
@@ -321,6 +381,14 @@ export default {
   saveMaterial,
   insertMaterialInfo,
   medcineitemBatchSave,
+  financeEdit,
+  centerEdit,
+  purchaseEdit,
+  inventoryEdit,
+  planEdit,
+  costEdit,
+
+  // 导入
   fileImport,
 
   // 删除

src/views/material/basicFile/details.vue

@@ -29,7 +29,7 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-                  <el-button size="small" @click="handleQuery">查询</el-button> -->
+                                                              <el-button size="small" @click="handleQuery">查询</el-button> -->
             <el-button size="small" @click="handleRefresh">刷新</el-button>
 
           </el-button-group>
@@ -49,7 +49,7 @@
                 <el-dropdown-item :command="isInvoke(true)">启用</el-dropdown-item>
                 <el-dropdown-item :command="isInvoke(false)">停用</el-dropdown-item>
               </el-dropdown-menu>
-                                                                 </el-dropdown> -->
+                                                                                                             </el-dropdown> -->
           </el-button-group>
         </el-col>
 
@@ -58,7 +58,7 @@
           <el-button-group>
             <el-button size="small" @click="handleQueryForm">申请单查询</el-button>
           </el-button-group>
-          </el-col> -->
+                                                      </el-col> -->
 
         <!-- 导入导出 -->
       <!-- <el-col :span="1.5">
@@ -66,7 +66,7 @@
             <el-button size="small" @click="handleImport">批量导入</el-button>
             <el-button size="small" @click="handleExport">批量导出</el-button>
           </el-button-group>
-            </el-col> -->
+                                                        </el-col> -->
 
       </el-row>
 
@@ -110,12 +110,12 @@
         </el-col>
         <el-col :span="6" style="text-align: right;">
           <!-- 附件管理 -->
-          <el-button-group>
+        <!-- <el-button-group>
             <el-button size="small" icon="el-icon-paperclip" @click="handleFile"></el-button>
-          </el-button-group>
+                                                      </el-button-group> -->
 
           <!-- 切换 -->
-          <el-button-group>
+        <!-- <el-button-group>
             <el-button size="small" icon="el-icon-d-arrow-left" :disabled="!handleBasicEdit"
               @click="handleChangePage('first')" />
             <el-button size="small" icon="el-icon-arrow-left" :disabled="!handleBasicEdit"
@@ -124,7 +124,7 @@
               @click="handleChangePage('next')" />
             <el-button size="small" icon="el-icon-d-arrow-right" :disabled="!handleBasicEdit"
               @click="handleChangePage('end')" />
-          </el-button-group>
+                                                      </el-button-group> -->
         </el-col>
       </el-row>
 
@@ -162,7 +162,7 @@
                         <!-- 多选框 -->
                         <el-form-item v-if="f.attribute == 'checkbox'" style="text-align: left;">
                           <el-checkbox :label="f.name" name="type" v-model="basicData.value[f.prop]"
-                            :disabled="!updateButtonGroup">
+                            :disabled="!(updateButtonGroup && f.edit)">
                           </el-checkbox>
                         </el-form-item>
 
@@ -171,10 +171,10 @@
                           :id="(updateButtonGroup && f.apiUrl) ? 'selected' : ''">
 
                           <el-select v-model="basicData.value[`${f.prop}Label`]" :placeholder="f.name"
-                            :key="basicData.value[f.prop]" :disabled="!updateButtonGroup"
+                            :key="basicData.value[f.prop]" :disabled="!(updateButtonGroup && f.edit)"
                             @focus="f.apiUrl && handleQueryMore(f, '', { name: 'basicData', prop: f.prop })">
-                            <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictValue" :label="d.dictLabel"
-                              :value="d.dictValue">
+                            <el-option v-if="f.dictId" v-for="d in f.dictValue" :key="d.dictCode" :label="d.dictLabel"
+                              :value="d.dictCode">
                             </el-option>
 
                             <div slot="empty"></div>
@@ -191,7 +191,7 @@
                         <!--attribute 文本 数字 文本域 为null -->
                         <el-form-item v-else :label="f.name">
                           <el-input size="small" v-model="basicData.value[f.prop]" :type="f.attribute || 'text'"
-                            :readonly="!updateButtonGroup" :placeholder="f.name">
+                            :readonly="!(updateButtonGroup && f.edit)" :placeholder="f.name">
                           </el-input>
                         </el-form-item>
                       </template>
@@ -295,13 +295,13 @@
                 <el-divider content-position="left">审计信息</el-divider>
                 <el-form :inline="true" label-position="right" :model="basicData.value">
                   <el-form-item label="创建人">
-                    <el-input v-model="basicData.value.createBy" size="small" readonly placeholder="创建人"></el-input>
+                    <el-input v-model="basicData.value.createByName" size="small" readonly placeholder="创建人"></el-input>
                   </el-form-item>
                   <el-form-item label="创建时间">
                     <el-input v-model="basicData.value.createTime" size="small" readonly placeholder="创建时间"></el-input>
                   </el-form-item>
                   <el-form-item label="最后修改人">
-                    <el-input v-model="basicData.value.updateBy" size="small" readonly placeholder="最后修改人"></el-input>
+                    <el-input v-model="basicData.value.updateByName" size="small" readonly placeholder="最后修改人"></el-input>
                   </el-form-item>
                   <el-form-item label="最后修改时间">
                     <el-input v-model="basicData.value.updateTime" size="small" readonly placeholder="最后修改时间"></el-input>
@@ -411,7 +411,7 @@
             <el-form :inline="true" label-position="right" :model="basicData.value">
             <!-- <el-form-item label="所属组织">
                   <el-input v-model="basicData.value.orgName" placeholder="所属组织"></el-input>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               </el-form-item> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           </el-form-item> -->
               <el-form-item label="物料编码">
                 <el-input v-model="basicData.value.code" size="small" readonly placeholder="物料编码"></el-input>
               </el-form-item>
@@ -423,7 +423,7 @@
               </el-form-item>
             <!-- <el-form-item label="版本号">
                 <el-input v-model="basicData.value.version"  placeholder="版本号"></el-input>
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               </el-form-item> -->
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           </el-form-item> -->
 
             </el-form>
           </el-collapse-item>
@@ -485,13 +485,13 @@
             <div class="md-auditInfo">
               <el-form :inline="true" label-position="right" :model="basicData.value">
                 <el-form-item label="创建人">
-                  <el-input v-model="basicData.value.createBy" size="small" readonly placeholder="创建人"></el-input>
+                  <el-input v-model="basicData.value.createByName" size="small" readonly placeholder="创建人"></el-input>
                 </el-form-item>
                 <el-form-item label="创建时间">
                   <el-input v-model="basicData.value.createTime" size="small" readonly placeholder="创建时间"></el-input>
                 </el-form-item>
                 <el-form-item label="最后修改人">
-                  <el-input v-model="basicData.value.updateBy" size="small" readonly placeholder="最后修改人"></el-input>
+                  <el-input v-model="basicData.value.updateByName" size="small" readonly placeholder="最后修改人"></el-input>
                 </el-form-item>
                 <el-form-item label="最后修改时间">
                   <el-input v-model="basicData.value.updateTime" size="small" readonly placeholder="最后修改时间"></el-input>
@@ -625,7 +625,7 @@ export default {
       // 副信息
       viceMsg: {
         form: [],
-        value: []
+        value: [],
       },
       // 操作弹窗
       optionDialog: {
@@ -789,7 +789,7 @@ export default {
           this.getTagList('material_property', (form) => {
 
             this.propertyDetail.form = form;
-            this.getPropertyList('');
+            this.getPropertyList(this.materialId);
           });
           break;
 
@@ -1036,9 +1036,9 @@ export default {
       })
     },
     // 获取利润中心详情
-    getCenterDetails(materialId) {
+    getCenterDetails(id) {
       let _this = this;
-      materialApi.centerDetails(materialId).then(res => {
+      materialApi.centerDetails(id).then(res => {
         console.log(res, '获取利润中心详情');
         if (res.code == 200) {
           this.otherDeatils.value = res.data.data;
@@ -1047,9 +1047,9 @@ export default {
       })
     },
     // 获取采购详细信息详情
-    getPurchaseDetails(materialId) {
+    getPurchaseDetails(id) {
       let _this = this;
-      materialApi.purchaseDetails(materialId).then(res => {
+      materialApi.purchaseDetails(id).then(res => {
         console.log(res, '获取采购详细信息详情');
         if (res.code == 200) {
           this.otherDeatils.value = res.data.data;
@@ -1080,9 +1080,9 @@ export default {
       })
     },
     // 获取库存详细信息详情
-    getInventoryDetails(materialId) {
+    getInventoryDetails(id) {
       let _this = this;
-      materialApi.inventoryDetails(materialId).then(res => {
+      materialApi.inventoryDetails(id).then(res => {
         console.log(res, '获取库存详细信息详情');
         if (res.code == 200) {
           this.otherDeatils.value = res.data.data;
@@ -1104,9 +1104,9 @@ export default {
         console.log(res, '医药行业');
         let { code, data } = res;
         if (code == 200) {
-          // _this.medcineData.value = data.data || {};
+          _this.medcineData.value = data.data || {};
           // this.medcineData.form = data.form;
-          // _this.handleAddReferLabel('medcineData');
+          _this.handleAddReferLabel('medcineData');
           console.log(' _this.medcineData', _this.medcineData, res);
         }
       })
@@ -1121,8 +1121,8 @@ export default {
       })
     },
     // 查询物料辅助属性列表+表头字段
-    getPropertyList() {
-      materialApi.propertyList().then(res => {
+    getPropertyList(materialId) {
+      materialApi.propertyList({ materialId }).then(res => {
         console.log(res, '料辅助属性列表');
         if (res.code == 200) {
           this.propertyDetail.value = res.data.data || [];
@@ -1198,8 +1198,6 @@ export default {
     },
 
 
-
-
     // 新增
     handleInster() {
       this.$message({
@@ -1435,7 +1433,7 @@ export default {
     },
     // 其他标签页弹窗保存
     handleOtherSave() {
-      console.log('其他标签页弹窗保存');
+      console.log('其他标签页弹窗保存', this.activeMainTab);
     },
     // 其他页签详情弹窗关闭事件
     handleCloseOtherDetails(done) {
@@ -1478,9 +1476,9 @@ export default {
     // 参照弹窗过滤
     handleFilterRefer() {
       // this.MoreDataDialog.key =
-      console.log(this.MoreDataDialog.key, '查询关键字');
+      console.log(this.MoreDataDialog.key, '查询关键字', this.MoreDataDialog.target);
 
-      this.handleQueryMore(this.MoreDataDialog.msg, this.MoreDataDialog.key);
+      this.handleQueryMore(this.MoreDataDialog.msg, this.MoreDataDialog.key, this.MoreDataDialog.target);
 
     },
     // 操作提示弹窗关闭
@@ -1565,6 +1563,60 @@ export default {
         if (res.code == 200) cb();
       })
     },
+    // 保存财务信息——单个数据
+    handleSaveFinance(data) {
+      console.log(data, '保存财务信息——单个数据');
+      materialApi.financeEdit(data).then(res => {
+        if (res.code == 200) {
+
+        }
+      })
+    },
+    // 保存利润中心信息
+    handleSaveCenter(data) {
+      console.log(data, '保存利润中心信息');
+      materialApi.centerEdit(data).then(res => {
+        if (res.code == 200) {
+
+        }
+      })
+    },
+    // 保存采购信息
+    handleSavePurchase(data) {
+      console.log(data, '保存采购信息');
+      materialApi.purchaseEdit(data).then(res => {
+        if (res.code == 200) {
+
+        }
+      })
+    },
+    // 保存库存信息
+    handleSaveInventoryEdit(data) {
+      console.log(data, '保存库存信息');
+      materialApi.inventoryEdit(data).then(res => {
+        if (res.code == 200) {
+
+        }
+      })
+    },
+    // 保存计划信息
+    handleSavePlan(data) {
+      console.log(data, '保存计划信息');
+      materialApi.planEdit(data).then(res => {
+        if (res.code == 200) {
+
+        }
+      })
+    },
+    // 保存成本信息
+    handleSaveCost(data) {
+      console.log(data, '保存成本信息');
+      materialApi.costEdit(data).then(res => {
+        if (res.code == 200) {
+
+        }
+      })
+    },
 
 
     // 重新加载
@@ -1581,7 +1633,6 @@ export default {
           this.medcineData.value[item.prop] = ''
         })
         this.medcineData.form = form;
-        console.log('this.medcineData this.medcineData  this.medcineData', this.medcineData);
         this.getMedcineDetails(this.materialId, 'material_medcine');
       })
     },
@@ -1611,6 +1662,8 @@ export default {
     height: calc(100vh - 160px);
     box-sizing: border-box;
     padding: 12px;
+    overflow-y: auto;
+    overflow-x: auto;
   }
 
   .md-content {
@@ -1622,8 +1675,8 @@ export default {
       overflow: auto;
 
       .md-main {
-        height: calc(100vh - 625px);
-        // max-height: 290px;
+        // height: calc(100vh - 625px);
+        max-height: 160px;
         margin-bottom: 10px;
         overflow-y: auto;
         overflow-x: hidden;