Merge remote-tracking branch 'lanju/master' into lanju

src/pages/equipment/Repair/index.vue

@@ -16,7 +16,8 @@
         <u-icon @click="linkdetails(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
       <div class="item1">设备编码: {{ item.equipmentCode }}</div>
-      <div class="item1">产线: {{ item.planProdLine }}</div>
+      <div class="item1">设备名称: {{ item.equipmentName }}</div>
+      <div class="item1">产线: {{ item.bindEquipmentName }}</div>
       <div class="item1">维修负责人: {{ item.workPerson }}</div>
       <div class="item1">故障描述: {{ item.workFaultDesc }}</div>
       <div class="item1">维修人员: {{ item.workPerson }}</div>
@@ -32,7 +33,8 @@
         <u-icon @click="linkdetailscheck(item)" name="arrow-right" color="#2979ff" size="28"></u-icon>
       </div>
       <div class="item1">设备编码: {{ item.equipmentCode }}</div>
-      <div class="item1">产线: {{ item.planProdLine }}</div>
+      <div class="item1">设备名称: {{ item.equipmentName }}</div>
+      <div class="item1">产线: {{ item.bindEquipmentName }}</div>
       <div class="item1">维修负责人: {{ item.workPerson }}</div>
       <div class="item1">故障描述: {{ item.workFaultDesc }}</div>
       <div class="item1">维修人员: {{ item.workPerson }}</div>

src/pages/equipment/Repairbx/index.vue

@@ -18,9 +18,9 @@
         <view class="single-right">
           <u-button type="primary" @click="query">查询</u-button>
         </view>
-        <view class="single-right">
-          <u-button type="primary" @click="selscteq()">选择</u-button>
-        </view>
+        <!--        <view class="single-right">-->
+        <!--          <u-button type="primary" @click="selscteq()">选择</u-button>-->
+        <!--        </view>-->
       </view>
     </u-form>
     <view class="list listbottom" v-show="isaccord">
@@ -44,6 +44,10 @@
           <u-form-item label="故障描述:">
             <jPicker sureColor="#ff0000" :moren="moren" @bindpicker="selectProductlocCode" @bindinput="selectbindinput" showKey="label" valKey="value" :val="orderDesc.value" :options="model.locList" />
           </u-form-item>
+          <u-form-item label="故障描述补充">
+            <u-input v-model="formdata.attr1" placeholder="请填写故障描述补充" type="textarea" :border="true" :height="100" :auto-height="true" />
+          </u-form-item>
+
           <!-- 机台 -->
           <u-form-item class="listbottom1" label="故障时间:">
             <u-input @click="blur()" type="select" v-model="orderBreakdownTime" />
@@ -142,6 +146,7 @@ export default class ChangePalletNew extends BasePage {
     equipmentLocation: '',
     orderDesc: '',
     orderBreakdownTime: '',
+    attr1: '',
     fileList: '',
     orderRepairman: '',
   };
@@ -150,11 +155,11 @@ export default class ChangePalletNew extends BasePage {
   showtime = false;
   defaulttime: any = '';
   orderDesc: any = {};
+  newSelect: any = {};
   async onReady() {
     this.defaulttime = moment().format('YYYY-MM-DD HH:mm:ss');
     console.log(this.defaulttime);
     // await this.model.getDictList();
-    await this.model.getFaultDescriptionList();
     //this.remove = this.model.WlList[0];
   }
   onShow() {
@@ -203,7 +208,11 @@ export default class ChangePalletNew extends BasePage {
         this.isaccord = true;
       }
     }
-    //console.log('this.orderNoItemList', this.orderNoItemList);
+    const equipmentTypeCode = model.orderNoItemList.equipmentTypeCode;
+    let params = {
+      attr1: equipmentTypeCode,
+    };
+    await this.model.getFaultDescriptionList(params);
   }
   selscteq() {
     uni.navigateTo({
@@ -239,13 +248,20 @@ export default class ChangePalletNew extends BasePage {
       });
       return;
     }
-    if (this.orderDesc.value == '' || this.orderDesc.value == undefined) {
+    if ((this.orderDesc.value == '' || this.orderDesc.value == undefined) && (this.formdata.attr1 == '' || this.formdata.attr1 == undefined)) {
       (this.$refs.uToast as any).show({
-        title: '故障描述不能为空',
+        title: '故障描述或补充必须填写一项',
         type: 'default',
       });
       return;
     }
+    // if (this.orderDesc.value == '' || this.orderDesc.value == undefined) {
+    //   (this.$refs.uToast as any).show({
+    //     title: '故障描述不能为空',
+    //     type: 'default',
+    //   });
+    //   return;
+    // }
     if (this.formdata.orderBreakdownTime == '' || this.formdata.orderBreakdownTime == undefined) {
       (this.$refs.uToast as any).show({
         title: '请输入故障时间',
@@ -260,7 +276,7 @@ export default class ChangePalletNew extends BasePage {
       equipmentCode: this.formdata.equipmentCode,
       equipmentName: this.formdata.equipmentName,
       equipmentLocation: this.formdata.equipmentLocation,
-      orderDesc: this.orderDesc.value,
+      orderDesc: this.orderDesc.value ? this.orderDesc.value : this.formdata.attr1,
       orderBreakdownTime: this.formdata.orderBreakdownTime,
       fileList: fileList,
       orderSource: '手持PDA',

src/pages/equipment/Repairbx/model.ts

@@ -40,8 +40,10 @@ export class Repairbx extends VuexModule {
   // 故障描述
   locList: any = [];
   @MutationAction
-  async getFaultDescriptionList() {
-    const result: any = await http.get(url.lanjuequipment.product.Repair.getFaultDescriptionList);
+  async getFaultDescriptionList(params: any) {
+    const result: any = await http.get(url.lanjuequipment.product.Repair.getFaultDescriptionList, {
+      params,
+    });
     const DictListoild: [] = result.data;
     const locList = DictListoild.map((item: any) => ({
       label: item.faultSubclass,