Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/view/performance/chejianbaogong.vue

@@ -8,7 +8,7 @@
 			<el-button type="primary" size="large" @click="onzhicheng"  >制程检验</el-button>
 			<el-button type="primary" size="large" @click="ondianjian"  >设备点检</el-button>
 			<el-button type="primary" size="large" @click="onxuncha" >管理巡查</el-button>
-			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>
+<!--			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>-->
 			<el-button type="primary" size="large" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" size="large" @click="onClear" >换型清场</el-button>
 			<el-button type="primary" size="large" @click="oncomplaints" >客诉记录</el-button>
@@ -2098,7 +2098,7 @@ const FacilityProduction = async (addr) => {
       formData.value.产品名称 = response.data.产品名称;
       formData.value.班组Id=response.data.班组Id
       formData.value.machine=JTMC
-      formData.value.状态='生产'
+      formData.value.状态=response.data.状态
       formData.value.定额代号=response.data.定额代号
       formData.value.addr=addr
       BZMC.value=response.data.班组编号
@@ -3008,7 +3008,7 @@ const GetMachineMac = async (addr) => {
   if (response.code === 0) {
     if(response.data===null){
       JTMC = 'MQ07#';
-      CJMC='模切车间';
+      CJMC='烫模车间';
       FacilityProduction(addr);
     }else{
       // 将接口返回的数据添加到树型结构中

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -1351,14 +1351,9 @@ const pd_gdprintonClick = () => {
 const oncjsbpcClick = async () => {
   cjsbpcformData['sbdh'] = _machine.value;
   paichengData.value = [];
-  await _EquipmentSchedulingdata();
-  await _ScheduleSelectiondata();
+   _EquipmentSchedulingdata();
+   _ScheduleSelectiondata();
 
-  paichengData.value.map((item, index) => {
-    item['优先次序'] = 50 + index
-  })
-
-  handleDataSortAndSettingDate()
   cjsbpclist.value = true;
 };
 //调用班次选择列表接口
@@ -1402,6 +1397,11 @@ const _EquipmentSchedulingdata = async ()=>{
     console.log(EquipmentSchedulingdata)
     if (EquipmentSchedulingdata.code === 0) {
       paichengData.value = EquipmentSchedulingdata.data
+      paichengData.value.map((item, index) => {
+        item['优先次序'] = 50 + index
+      })
+
+      handleDataSortAndSettingDate()
     }
   } catch (error) {
     console.error(error);

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -1696,11 +1696,11 @@ const gd_clearFormData = () => {
 //新增工单资料按钮
 const addgd_onclick = () => {
   gd_clearFormData();
-  add_gdscgdformData['重点工单'] = '打样工单';
+  add_gdscgdformData['重点工单'] = '';
   add_gdscgdformData['订单数量'] = 0;
   add_gdscgdformData['平张投料'] = 0;
   add_gdscgdformData['万小张'] = 0;
-  add_gdscgdformData['单位'] = "张";
+  add_gdscgdformData['单位'] = "万张";
   add_gdscgdformData['投料大箱'] = 0;
   add_gdscgdformData['码源数量'] = 0;
   add_gdscgdformData['开单日期'] = currentDate;