Shan9312 7 kuukautta sitten
vanhempi
commit
8b97776905

+ 1 - 1
src/views/maintenance/repair/index.vue

@@ -3387,7 +3387,7 @@ export default {
       }
       GetDataByName(requestBody).then(response => {
         console.log('hss', response.data.list)
-        if (response.data.list != null) {
+        if (response.data.list != null && response.data.list[0].vmsg != '' ) {
           this.compateleMsg = response.data.list[0].vmsg;
           this.$alert(this.compateleMsg, '维修进度通知', {
           confirmButtonText: '确定',

+ 33 - 1
src/views/maintenance/subcontractingMainten/tabPage/tab1.vue

@@ -78,7 +78,7 @@
           <el-button   type="primary" size="mini" @click="form_see(row)">查看</el-button>
           <el-button v-if="istab1Edit && (row.status !== 0) && (row.status !== 1) "  type="success" size="mini" @click="form_edit(row)">编辑</el-button>
           <el-button v-if="istab1Del && (row.status !== 1) "  type="danger" size="mini" @click="form_delete(row)">删除</el-button>
-          <!-- <el-button  v-if="row.isAcceptance == 0"  style="display:inline-block" type="success" size="mini" @click="form_submit(row)">提交</el-button> -->
+          <el-button  v-if="row.status !== 0  && row.status !== 1"  style="display:inline-block" type="success" size="mini" @click="form_submit(row)">提交</el-button>
           <!-- <el-button  v-if="row.isAcceptance == 0"  style="display:inline-block" type="warning" size="mini" @click="form_closeSubmit(row)">关单</el-button> -->
 
           <el-button  v-if="istab1Shenhe1 && (row.status== 0) && (row.flowCompeleted == 1) "  style="display:inline-block" type="success" size="mini" @click="form_examine(row)">审核1</el-button>
@@ -572,6 +572,38 @@ export default {
     this.get_auto_buttons()
   },
   methods: {
+    // 提交按钮
+    form_submit(row) {
+      MessageBox.confirm('确认提交此条信息?', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        var send_data2 = {
+         "common": { "returnmap": "0" },
+        "data": [
+            {
+              "name": "editBigoutsourcingSubmit", "type": "e",
+              "parammaps": { "id":row.id }
+            }
+          ]
+        }
+          this.save_submit(send_data2)
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消提交'
+        })
+      })
+    },
+    save_submit(send_data) {
+      ExecDataByConfig(send_data).then(response => {
+        if (response.msg !== 'fail') {
+          this.$notify({ title: '成功', message: '提交成功', type: 'success', duration: 2000 })
+          this.get_table_data1()
+        }
+      })
+    },
     //获取按钮权限
     get_auto_buttons() {
       const istab1Add = checkButtons(this.$store.state.user.buttons, 'maintenance:subcontractingMainten:add')

+ 21 - 7
src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -156,7 +156,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="日期:" prop="date">
+              <el-form-item  class="is-requied"  label="日期:" prop="date">
                 <el-date-picker v-model="createTemp.date" :picker-options="pickerOptions" type="date" placeholder="日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" :disabled="dialogStatus==='see'"  />
               </el-form-item>
             </el-col>
@@ -169,12 +169,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="离厂日期:" prop="lcdate">
+              <el-form-item  class="is-requied"  label="离厂日期:" prop="lcdate">
                 <el-date-picker v-model="createTemp.lcdate" :picker-options="pickerOptions" type="date" placeholder="日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" :disabled="dialogStatus==='see'"  />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="回厂日期:" prop="hcdate">
+              <el-form-item class="is-requied"  label="回厂日期 :" prop="hcdate">
                 <el-date-picker v-model="createTemp.hcdate" :picker-options="pickerOptions" type="date" placeholder="日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" :disabled="dialogStatus==='see'"  />
               </el-form-item>
             </el-col>
@@ -238,7 +238,7 @@
                 <span>{{ scope.row.typea }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="铅封号" prop="sealNumber" align="center" min-width="80px">
+            <el-table-column :render-header="addRedStar"  label="铅封号 " prop="sealNumber" align="center" min-width="80px">
               <template slot-scope="scope">
                 <span v-if="dialogStatus ==='create'||dialogStatus ==='update'">
                   <el-input v-model="scope.row.sealNumber" style="margin-top:10px" />
@@ -246,7 +246,7 @@
                 <span v-if="dialogStatus ==='see'">{{ scope.row.sealNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="质保日期" prop="warrantydate" align="center" min-width="80px">
+            <el-table-column   :render-header="addRedStar"  label="质保日期" prop="warrantydate" align="center" min-width="80px">
               <template slot-scope="scope">
                 <span v-if="dialogStatus ==='create'||dialogStatus ==='update'">
                   <!-- <el-date-picker v-model="scope.row.warrantydate" :picker-options="pickerOptions" type="date" placeholder="日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="margin-top:10px" /> -->
@@ -812,6 +812,7 @@ export default {
         equipmentName: [{ required: true, message: '必填', trigger: 'blur' }],
         // lcdate: [{ required: true, message: '必填', trigger: 'blur' }],
         // hcdate: [{ required: true, message: '必填', trigger: 'blur' }],
+        // date: [{ required: true, message: '必填', trigger: 'blur' }]
       },
       getPramPartApplyListBybig: {
         name:"getpartapplyListBybig",
@@ -961,6 +962,14 @@ export default {
 
   },
   methods: {
+     // 给表头加必填符号*
+     addRedStar(h, { column }) {
+      return [
+        h("span", { style: "color: red" }, "*"),
+        h("span", " " + column.label)
+      ]
+    },
+
     //获取按钮权限
     get_auto_buttons() {
       const istab2Add = checkButtons(this.$store.state.user.buttons, 'maintenance:subcontractingMainten2:add')
@@ -2361,7 +2370,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消提交'
+          message: '已取消关单'
         })
       })
     },
@@ -2378,7 +2387,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-
+ 
+ ::v-deep .is-requied .el-form-item__label::before{
+    content:'*';
+    color:red;
+    margin-right: 4px;
+  }
   .content{
     padding: 20px 20px;
     .title{