3
2
Prechádzať zdrojové kódy

修改检测计划内内容

Liuqi 6 rokov pred
rodič
commit
43cf63d562

+ 1 - 0
src/dashoo.cn/frontend_web/src/pages/lims/dataentry/tacktodo.vue

@@ -346,6 +346,7 @@
         tooldownloaddialog: false,
         jiaoheshow: false,
         CheckStatus: 0,
+        BalanceTime: [],
         EntryId: '',
         key: '',
         SId: 0,

+ 6 - 3
src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/datamain.vue

@@ -8,11 +8,12 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable placeholder="请选择"
+              <el-input v-model="EntrustCorpName" placeholder="请输入" style="width: 100%" readonly></el-input>
+              <!-- <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable placeholder="请选择"
                          style="width: 100%" >
                 <el-option v-for="item in EntrustCorpOptions" :key="item.Id" :label="item.CustomerName" :value="item.Id">
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -152,6 +153,7 @@
           children: 'children'
         },
         EntrustCorp: 0,
+        EntrustCorpName: '',
         formData: {
           // TestDepartId: '',
           PositionCheckId: '',
@@ -255,7 +257,8 @@
 
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
-          this.EntrustCorp = res.data.CustomerName
+          this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getEntrustCorpItems(this.EntrustCorp)
         }).catch(err => {
           // handle error

+ 6 - 3
src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/datamain.vue

@@ -9,7 +9,8 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="委托单位">
-                <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
+                <el-input v-model="EntrustCorpName" placeholder="请输入" style="width: 100%" readonly></el-input>
+                <!-- <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
                            placeholder="请选择" style="width: 100%">
                   <el-option
                     v-for="item in EntrustCorpOptions"
@@ -17,7 +18,7 @@
                     :label="item.CustomerName"
                     :value="item.Id">
                   </el-option>
-                </el-select>
+                </el-select> -->
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -200,6 +201,7 @@
           children: 'children'
         },
         EntrustCorp: 0,
+        EntrustCorpName: '',
         formData: {
           TestDepartId: '',
           PositionCheckId: '',
@@ -318,7 +320,8 @@
 
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
-          this.EntrustCorp = res.data.CustomerName
+          this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getEntrustCorpItems(this.EntrustCorp)
         }).catch(err => {
           // handle error

+ 6 - 3
src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/datamain.vue

@@ -8,7 +8,8 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
+              <el-input v-model="EntrustCorpName" placeholder="请输入" style="width: 100%" readonly></el-input>
+              <!-- <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
                          placeholder="请选择" style="width: 100%">
                 <el-option
                   v-for="item in EntrustCorpOptions"
@@ -16,7 +17,7 @@
                   :label="item.CustomerName"
                   :value="item.Id">
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -199,6 +200,7 @@
           options: []
         }],
         EntrustCorp: 0,
+        EntrustCorpName: '',
         formData: {
           TestDepartId: '',
           PositionCheckId: '',
@@ -314,7 +316,8 @@
 
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
-          this.EntrustCorp = res.data.CustomerName
+          this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getEntrustCorpItems(this.EntrustCorp)
         }).catch(err => {
           // handle error

+ 6 - 3
src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/datamain.vue

@@ -8,7 +8,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="委托单位">
-              <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
+              <!-- <el-select disabled ref="selectEntrustCorp" v-model="EntrustCorp" filterable
                          placeholder="请选择" style="width: 100%">
                 <el-option
                   v-for="item in EntrustCorpOptions"
@@ -16,7 +16,8 @@
                   :label="item.CustomerName"
                   :value="item.Id">
                 </el-option>
-              </el-select>
+              </el-select> -->
+              <el-input v-model="EntrustCorpName" placeholder="请输入" style="width: 100%" readonly></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -198,6 +199,7 @@
           options: []
         }],
         EntrustCorp: 0,
+        EntrustCorpName: '',
         formData: {
           TestDepartId: '',
           PositionCheckId: '',
@@ -311,7 +313,8 @@
 
       getEntrustInfo (EId) {
         entrustApi.getEntrustInfo(EId, this.$axios).then(res => {
-          this.EntrustCorp = res.data.CustomerName
+          this.EntrustCorp = res.data.CustomerId
+          this.EntrustCorpName = res.data.CustomerName
           this.getEntrustCorpItems(this.EntrustCorp)
         }).catch(err => {
           // handle error

+ 3 - 3
src/dashoo.cn/frontend_web/src/pages/lims/tasksentrust/_opera/operation.vue

@@ -61,7 +61,7 @@
               <el-select ref="selectCustomer" v-model="mainForm.CustomerId" filterable placeholder="请选择" style="width: 100%"
                 @change="chooseCustomer">
                 <el-option-group v-for="group in groupOptions" :key="group.label" :label="group.label">
-                  <el-option v-for="item in group.options" :key="item.Id" :label="item.CustomerName" :value="item.Id">
+                  <el-option v-for="item in group.options" :key="item.Id" :label="item.Fullname" :value="item.Id">
                   </el-option>
                 </el-option-group>
               </el-select>
@@ -1536,8 +1536,8 @@
         for (var i = 0; i < _this.customerList.length; i++) {
           if (_this.customerList[i].Id == _this.mainForm.CustomerId) {
             _this.mainForm.CustomerCode = _this.customerList[i].CustomerCode
-            _this.mainForm.CustomerPerson = _this.customerList[i].Person
-            _this.mainForm.CustomerTelephone = _this.customerList[i].Telephone
+            _this.mainForm.CustomerPerson = _this.customerList[i].Contacts
+            _this.mainForm.CustomerTelephone = _this.customerList[i].Phone
             _this.mainForm.Address = _this.customerList[i].Address
           }
         }