Browse Source

bug修改

ljb 7 months ago
parent
commit
1f414f123e

+ 17 - 9
src/components/asset-select/index.vue

@@ -1,6 +1,6 @@
 <template>
   <el-select
-    v-model="assetId"
+    v-model="assetVal"
     filterable
     placeholder="请选择 资产名称"
     :loading="loading"
@@ -11,9 +11,9 @@
   >
     <el-option
       v-for="item in listData"
-      :key="item.id"
-      :label="item.zcmc"
-      :value="item.id">
+      :key="item.value"
+      :label="item.title"
+      :value="item.value">
     </el-option>
   </el-select>
 </template>
@@ -35,11 +35,15 @@ export default {
     multiple: {
       type: Boolean,
       default: false
+    },
+    valueKey: {
+      type: String,
+      default: 'id'
     }
   },
   data() {
     return {
-      assetId: '',
+      assetVal: '',
       loading: false,
       listData: []
     }
@@ -52,16 +56,20 @@ export default {
       getList(1, 99999, this.params).then(({ data }) => {
         if (data.success) {
           if (this.params.zclb) {
-            this.listData = data.data.records.filter(item => this.params.zclb.indexOf(item.zclb) > -1);
+            this.listData = data.data.records.filter(item => this.params.zclb.indexOf(item.zclb) > -1).map(item => {
+              return { ...item, title: item.zcmc, value: item[this.valueKey] }
+            });
           } else {
-            this.listData = data.data.records;
+            this.listData = data.data.records.map(item => {
+              return { ...item, title: item.zcmc, value: item[this.valueKey] }
+            });
           }
-          this.assetId = this.value;
+          this.assetVal = this.value;
         }
       })
     },
     handleChange(val) {
-      let objData = this.listData.find(item => item.id === val);
+      let objData = this.listData.find(item => item[this.valueKey] == val);
 
       this.$emit('input', val);
       this.$emit('change', objData);

+ 1 - 1
src/option/achievement/technicalStandard.js

@@ -81,7 +81,7 @@ export default {
     },
     {
       label: "起草单位",
-      prop: "qlr",
+      prop: "qcdw",
       span: 24,
       width: 100,
       search: true,

+ 1 - 1
src/option/yfCostManage/basicDataSetting/wxzcDetail.js

@@ -66,7 +66,7 @@ export default {
     },
     {
       label: '无形资产名称',
-      prop: 'assetId',
+      prop: 'zcbm_form',
       span: 24,
       hide: true,
       rules: [{

+ 14 - 14
src/views/achievement/technical-standard.vue

@@ -134,20 +134,20 @@ export default window.$crudCommon({
       }
       return true;
     },
-    addBefore(loading, callback) {
-      if (!this.validCustom()) {
-        loading();
-        return;
-      }
-      callback && callback();
-    },
-    updateBefore(loading, callback) {
-      if (!this.validCustom()) {
-        loading();
-        return false;
-      }
-      callback && callback();
-    },
+    // addBefore(loading, callback) {
+    //   if (!this.validCustom()) {
+    //     loading();
+    //     return;
+    //   }
+    //   callback && callback();
+    // },
+    // updateBefore(loading, callback) {
+    //   if (!this.validCustom()) {
+    //     loading();
+    //     return false;
+    //   }
+    //   callback && callback();
+    // },
     handleImport() {
       this.$refs.uploadExcelDialog.open('/api/kd-scientific/kycg/jsbz/import');
     },

+ 9 - 6
src/views/yf-cost-manage/basic-data-setting/wxzc-details.vue

@@ -94,10 +94,11 @@
         <project-select v-model="form.xmId" :params="{ yearAndMonth: params.yearAndMonth }" :noDetail="true" @change="handleProjectChange"></project-select>
       </template>
 
-      <template slot="assetIdForm">
+      <template slot="zcbm_formForm">
         <asset-select
-          v-model="form.assetId"
+          v-model="form.zcbm_form"
           :params="{ yearAndMonth: params.yearAndMonth, zclb: '软件,专利权,非专利技术,其他' }"
+          valueKey="zcbm"
           @change="handleAssetChange"
         ></asset-select>
       </template>
@@ -236,17 +237,17 @@ export default window.$crudCommon({
         }
       });
     },
-    handleAssetChange({ zcbm }) {
-      this.form = { ...this.form, zcbm };
+    handleAssetChange({ assetId }) {
+      this.form = { ...this.form, assetId };
     },
     getFormData() {
-      const { id, xmId, assetId, zcbm, userUnicode } = this.form;
+      const { id, xmId, assetId, zcbm_form, userUnicode } = this.form;
       let userName;
       if (!!userUnicode) {
         let personObj = this.cyPersonList.find(item => item.unicode === userUnicode);
         userName = personObj ? personObj.name : undefined;
       }
-      return { id, xmId, assetId, zcbm, userUnicode, userName, yearAndMonth: this.params.yearAndMonth };
+      return { id, xmId, assetId, zcbm: zcbm_form, userUnicode, userName, yearAndMonth: this.params.yearAndMonth };
     },
     handleProjectChange(data) {
       this.getCyPersonListFunc(data.xmmc);
@@ -273,6 +274,7 @@ export default window.$crudCommon({
   name: 'yfCostManage/basicDataSetting/wxzcDetail',
   res: ({ data }) => {
     data.records = data.records.map(item => {
+      item.zcbm_form = item.zcbm;
       item.zcmc = item.asset ? item.asset.zcmc : '';
       item.zclb = item.asset ? item.asset.zclb : '';
       item.gl = item.asset ? item.asset.gl : '';
@@ -286,6 +288,7 @@ export default window.$crudCommon({
       item.status = item.asset ? item.asset.status : '';
       return item;
     });
+    console.log(data.records)
     return data;
   },
 });