新增生产工单字段

common/http.api.js

@@ -127,7 +127,11 @@ const install = (Vue, vm) => {
         getM2mOrderPackageList: (params = {}) => vm.$u.get(config.adminPath +
             '/mobile/index/getM2mOrderPackageList', params),
 
-        logout: (params = {}) => vm.$u.get(config.adminPath + '/mobile/login/logout', params),
+        //查看生产工单
+		getWorkorder: (params = {}) => vm.$u.get(config.adminPath + '/mes/pro/workorder/list', params),
+        
+		
+		logout: (params = {}) => vm.$u.get(config.adminPath + '/mobile/login/logout', params),
         authInfo: (params = {}) => vm.$u.get(config.adminPath + '/authInfo', params),
         menuTree: (params = {}) => vm.$u.get(config.adminPath + '/menuTree', params),
         switchSys: (params = {}) => vm.$u.get(config.adminPath + '/switch/' + params.sysCode),

pages/mes/prodReport/index.vue

@@ -110,6 +110,20 @@
               </u-form-item>
             </u-col>
           </u-row>
+          <u-row>
+            <u-col span="6">
+              <u-form-item label="编排单号" prop="quantity">
+                <u-input v-model="feedback.arrangeCode" ></u-input>
+              </u-form-item>
+            </u-col>
+            <u-col span="6">
+              <u-form-item label="生产工单" prop="workorderId">
+                <!-- <u-input v-model="feedback.nickName" @change=""></u-input> -->
+            <!-- <uni-data-select :localdata="reasonList" @change="changeReason"></uni-data-select> -->
+            <uni-data-select :localdata="feedback.workorderList" @change="workorderSelect($event, feedback)"></uni-data-select>
+            </u-form-item>
+            </u-col>
+          </u-row>
           <u-row>
             <u-col span="6">
               <u-form-item label="合格品数量" prop="quantityQualify">
@@ -124,6 +138,13 @@
               </u-form-item>
             </u-col>
           </u-row>
+		  <u-row>
+		  <u-col span="6">
+		      <u-form-item label="打印" prop="printName">
+		        <u-input v-model="feedback.printName"></u-input>
+		      </u-form-item>
+		    </u-col>
+		  </u-row>
         </u-form>
       </view>
     </u-modal>
@@ -154,15 +175,24 @@
     <u-modal title="暂停原因" @confirm="stopReasonSubmit()" show-cancel-button
         :title-style="{'background-color':'#1E3770','color': '#FFFFFF' ,'line-height': '37px','padding-top': '0px'}"
         v-model="stopReasonVisible" width="1300rpx">
-        <u-form label-width="100px" :model="feedback" :rules="rules">
-            <u-form-item label="暂停原因" prop="quantity">
-                <uni-data-select :localdata="exception" @change="stopReas"></uni-data-select>
-            </u-form-item>
-            <u-form-item label="暂停描述" prop="nickName">
-                <!-- <u-input type="textarea" height="150" :border="true" v-model="stopReason"></u-input> -->
-				<uni-data-select :localdata="reasonList" @change="changeReason"></uni-data-select>
-            </u-form-item>
-        </u-form>
+        <view>
+			<u-form label-width="120px" :model="feedback" :rules="rules">
+			    <u-form-item label="暂停原因" prop="quantity">
+			        <uni-data-select :localdata="exception" @change="stopReas"></uni-data-select>
+			    </u-form-item>
+			    <u-form-item label="暂停描述" prop="nickName">
+					<uni-data-select :localdata="reasonList" @change="changeReason"></uni-data-select>
+			    </u-form-item>
+			</u-form>
+			<!-- <uni-forms :modelValue="feedback" label-width="120px">
+				<uni-forms-item label="暂停原因" name="quantity">
+					<uni-data-select :localdata="exception" @change="stopReas"></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="暂停描述" name="nickName">
+					<uni-data-select :localdata="reasonList" @change="changeReason"></uni-data-select>
+				</uni-forms-item>
+			</uni-forms> -->
+		</view>
     </u-modal>
 
 
@@ -171,10 +201,10 @@
                  :title-style="{'background-color':'#1E3770','color': '#FFFFFF' ,'line-height': '60px','padding-top': '0px'}"
                  v-model="aopen" width="1300rpx">
           <u-form label-width="90px" :rules="rules">
-           <!-- <u-form-item label="异常时间" prop="abnormalTime">
-              <u-input   :border="true" v-model="ExceptionForms.abnormalTime"></u-input>
+           <u-form-item label="异常时间" prop="abnormalTime">
+            <!--  <u-input   :border="true" v-model="ExceptionForms.abnormalTime"></u-input> -->
               <uni-datetime-picker class="times" type="date" :clear-icon="false" v-model="ExceptionForms.abnormalTime" />
-            </u-form-item> -->
+            </u-form-item>
 			
             <u-row>
               <u-col span="6">
@@ -652,6 +682,7 @@ export default {
 			viewSopPicture: [],
 			viewSop: [],
             reasonList: [],
+			workorderList: [],
             materialUsageRecordList: [],
             materialusagerecordLoading: false,
             issusLineList: [],
@@ -946,6 +977,14 @@ export default {
     changeReason(abnormalReason) {
       this.ExceptionForms.abnormalReason = abnormalReason
     },
+    workorderSelect(id, row) {
+      console.log(id, row)
+      const items= row.workorderList.find(item => item.value === id)
+      console.log(items, 'items')
+      row.workorderCode = items.text
+      row.printName = items.text 
+    },
+	
     stopReas(abnormalType) {
       this.ExceptionForms.abnormalType = abnormalType
       // 查询原因
@@ -962,6 +1001,22 @@ export default {
           })
       })
     },
+	stopWorkorder(item) {
+	  // 查询原因
+	  this.$u.api.getWorkorder({
+	      pageNum: 1,
+	      pageSize: 10,
+	      arrangeCode:item.arrangeCode
+	  }).then(res => {
+	      item.workorderList = res.rows.map(item => {
+	          return {
+	              value: item.workorderId,
+	              text: item.workorderCode
+	          }
+	      })
+	  })
+	},
+	
     getTaskList() {
       this.form = {}
       const t = this;
@@ -1072,11 +1127,16 @@ export default {
           quantity: item.quantity,
           quantityQualify: 0,
           quantityUnqualify: 0,
-          nickName: this.vuex_user.nickName
+          printName: item.arrangeCode,
+          nickName: this.vuex_user.nicfeedbackkName,
+          workorderList: []
         }
+        this.stopWorkorder(feedback)
         this.feedbackForms.push(feedback)
       })
       this.open = true;
+	    
+	  
     },
 
     doException() {