Merge remote-tracking branch 'origin/master'

src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@@ -156,7 +156,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6"><div class="grid-content bg-purple">
-          <el-form-item :label="'pod'">
+          <el-form-item :label="'POD'">
             <el-select v-model="dataForm.pod" :disabled="ifDisableFlag">
               <el-option label="Y" value="Y"></el-option>
               <el-option label="N" value="N"></el-option>

src/views/modules/tooling/searchToolApply.vue

@@ -242,6 +242,12 @@
         <el-form-item :label="'申请编号'">
           <el-input v-model="dataForm.applyNo" style="width: 130px" disabled></el-input>
         </el-form-item>
+        <el-form-item :label="'申请总数'">
+          <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
+        </el-form-item>
+        <el-form-item  label="部门" required="required">
+          <dict-data-select :site="$store.state.user.site"  v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
+        </el-form-item>
         <el-form-item :label="'申请人'" required="required">
           <el-input v-model="dataForm.applyBy" style="width: 130px" disabled></el-input>
         </el-form-item>
@@ -255,11 +261,17 @@
             placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="'申请总数'">
-          <el-input v-model="dataForm.applySumQty" style="width: 130px" disabled></el-input>
+        <el-form-item required="required">
+          <span slot="label" style="" @click="getBaseList(103,1)"><a herf="#">报价员</a></span>
+          <el-input  v-model="dataForm.quoterName" ref="quoterName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
         </el-form-item>
-        <el-form-item  label="部门" required="required">
-          <dict-data-select :site="$store.state.user.site"  v-model="dataForm.department" dict-type="tool_application_department" disabled style="width: 130px"></dict-data-select>
+        <el-form-item required="required">
+          <span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">TP</a></span>
+          <el-input  v-model="dataForm.tpName" ref="tpName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
+        </el-form-item>
+        <el-form-item required="required">
+          <span slot="label" style="" @click="getBaseList(103,3)"><a herf="#">采购员</a></span>
+          <el-input  v-model="dataForm.purchaserName" ref="purchaserName" placeholder="请选择人员" readonly style="width: 130px" ></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" label-width="100px" >
@@ -448,6 +460,12 @@
           status: '',
           rejectOpinion: '',
           nodeConclusion: '',
+          quoter: '',
+          quoterName: '',
+          tp: '',
+          tpName: '',
+          purchaser: '',
+          purchaserName: '',
           menuId: this.$route.meta.menuId,
           userName: this.$store.state.user.name,
         },
@@ -669,6 +687,60 @@
             fixed: '',
             columnWidth: 60
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table1QuoterName',
+            tableId: "106002Table1",
+            tableName: "刀具申请主表",
+            columnProp: "quoterName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "报价员",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table1TpName',
+            tableId: "106002Table1",
+            tableName: "刀具申请主表",
+            columnProp: "tpName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "TP",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 106002,
+            serialNumber: '106002Table1PurchaserName',
+            tableId: "106002Table1",
+            tableName: "刀具申请主表",
+            columnProp: "purchaserName",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "采购员",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 60
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 106002,
@@ -1012,9 +1084,15 @@
         this.tagNo2 = type
         this.$nextTick(() => {
           let strVal = ''
-          if (val === 1010) {
+          if (val === 103) {
             if(type==1) {
-              strVal = this.searchData.projectType
+              strVal = this.dataForm.quoter
+            }
+            if(type==2) {
+              strVal = this.dataForm.tp
+            }
+            if(type==3) {
+              strVal = this.dataForm.purchaser
             }
           }
           this.$refs.baseList.init(val, strVal)
@@ -1022,9 +1100,27 @@
       },
       /* 列表方法的回调 */
       getBaseData (val) {
-        if (this.tagNo === 1010) {
+        if (this.tagNo === 103) {
           if(this.tagNo2==1) {
-            this.searchData.projectType = val.Base_desc
+            this.dataForm.quoter = val.username
+            this.dataForm.quoterName = val.user_display
+            this.$nextTick(() => {
+              this.$triggerInputEvent(this.$refs.quoterName);
+            });
+          }
+          if(this.tagNo2==2) {
+            this.dataForm.tp = val.username
+            this.dataForm.tpName = val.user_display
+            this.$nextTick(() => {
+              this.$triggerInputEvent(this.$refs.tpName);
+            });
+          }
+          if(this.tagNo2==3) {
+            this.dataForm.purchaser = val.username
+            this.dataForm.purchaserName = val.user_display
+            this.$nextTick(() => {
+              this.$triggerInputEvent(this.$refs.purchaserName);
+            });
           }
         }
       },
@@ -1196,6 +1292,12 @@
           status: row.status,
           rejectOpinion: '',
           nodeConclusion: '',
+          quoter: row.quoter,
+          quoterName: row.quoterName,
+          tp: row.tp,
+          tpName: row.tpName,
+          purchaser: row.purchaser,
+          purchaserName: row.purchaserName,
           menuId: this.$route.meta.menuId,
           userName: this.$store.state.user.name,
         }
@@ -1459,6 +1561,12 @@
                 this.dataList1[i].remark = this.dataForm.remark
                 this.dataList1[i].applySumQty = this.dataForm.applySumQty
                 this.dataList1[i].applyReason = this.dataForm.applyReason
+                this.dataList1[i].quoter = this.dataForm.quoter
+                this.dataList1[i].tp = this.dataForm.tp
+                this.dataList1[i].purchaser = this.dataForm.purchaser
+                this.dataList1[i].quoterName = this.dataForm.quoterName
+                this.dataList1[i].tpName = this.dataForm.tpName
+                this.dataList1[i].purchaserName = this.dataForm.purchaserName
               }
             }
             this.visible = false