完成生产计划表单添加校验规则

DESKTOP-AO0VKC8\mahua
1 parent 7bf4bb66
Showing 5 changed files with 187 additions and 110 deletions
src/views/scheduler/SchedulerDetailList.vue
src/views/scheduler/SchedulerHeaderList.vue
src/views/scheduler/SchedulerTransactionList.vue
src/views/scheduler/modules/SchedulerCompleteModal.vue
src/views/scheduler/modules/SchedulerDetailModal.vue
@@ -38,25 +38,6 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
  
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
  
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
@@ -81,6 +62,8 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import SchedulerDetailModal from './modules/SchedulerDetailModal'
   import SchedulerCompleteModal from '@views/scheduler/modules/SchedulerCompleteModal'
+  import { getTechnology, getTechnologyType } from '@api/api'
+  import { JVXETypes } from '@comp/jeecg/JVxeTable'
  
   export default {
     name: "SchedulerDetailList",
@@ -145,7 +128,8 @@
           {
             title: '工艺类型',
             align: 'center',
-            dataIndex: 'technologyType'
+            dataIndex: 'technologyType',
+            scopedSlots: {customRender: 'esContent'}
           },
           {
             title: '工艺',
@@ -201,6 +185,32 @@
             dataIndex: 'delayReason'
           },
           {
+            title:'创建人',
+            align:"center",
+            dataIndex: 'createBy'
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
+            title:'更新人',
+            align:"center",
+            dataIndex: 'updateBy'
+          },
+          {
+            title:'更新日期',
+            align:"center",
+            dataIndex: 'updateTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
+          },
+          {
             title: '操作',
             dataIndex: 'action',
             align:"center",
@@ -219,10 +229,14 @@
         dictOptions:{
         },
         superFieldList:[],
+        technologyList: {},
+        technologyTypeList: {}
       }
     },
     created() {
       this.getSuperFieldList();
+      this.getTechnologyTypeList();
+      this.getTechnologyList();
     },
     computed: {
       importExcelUrl(){
@@ -249,6 +263,35 @@
         this.$refs.completeForm.edit(record);
         this.$refs.completeForm.title = "完成";
         this.$refs.completeForm.disableSubmit = false;
+      },
+      getTechnologyTypeList() {
+        const that = this;
+        let obj = getTechnologyType();
+        obj.then((res) => {
+          if (res.success) {
+            that.technologyTypeList = res.result;
+          } else {
+            that.$message.warning(res.message);
+          }
+        })
+      },
+      getTechnologyList() {
+        const that = this;
+        let obj = getTechnology();
+        obj.then((res) => {
+          if (res.success) {
+            that.technologyList = res.result;
+          } else {
+            that.$message.warning(res.message);
+          }
+        })
+      },
+      rewriteTechnologyType(val) {
+        this.technologyTypeList.forEach(item=>{
+          if (item.typeId == val) {
+            return item.name
+          }
+        })
       }
     }
   }
@@ -145,30 +145,43 @@
             }
           },
           {
-            title:'创建人',
+            title:'计划完成时间',
             align:"center",
-            dataIndex: 'createBy'
+            dataIndex: 'completionTime',
+            customRender:function (text) {
+              return !text?"":(text.length>10?text.substr(0,10):text)
+            }
           },
           {
-            title:'创建时间',
+            title:'实际完成时间',
             align:"center",
-            dataIndex: 'created',
+            dataIndex: 'actualCompletionTime',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
           {
-            title:'计划完成时间',
+            title:'创建人',
             align:"center",
-            dataIndex: 'completionTime',
+            dataIndex: 'createBy'
+          },
+          {
+            title:'创建日期',
+            align:"center",
+            dataIndex: 'createTime',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
           },
           {
-            title:'实际完成时间',
+            title:'更新人',
             align:"center",
-            dataIndex: 'actualCompletionTime',
+            dataIndex: 'updateBy'
+          },
+          {
+            title:'更新日期',
+            align:"center",
+            dataIndex: 'updateTime',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
             }
@@ -140,7 +140,32 @@ export default {
           title: '完成时间',
           align: "left",
           dataIndex: 'completeDate',
-        }
+        }, {
+          title:'创建人',
+          align:"center",
+          dataIndex: 'createBy'
+        },
+        {
+          title:'创建日期',
+          align:"center",
+          dataIndex: 'createTime',
+          customRender:function (text) {
+            return !text?"":(text.length>10?text.substr(0,10):text)
+          }
+        },
+        {
+          title:'更新人',
+          align:"center",
+          dataIndex: 'updateBy'
+        },
+        {
+          title:'更新日期',
+          align:"center",
+          dataIndex: 'updateTime',
+          customRender:function (text) {
+            return !text?"":(text.length>10?text.substr(0,10):text)
+          }
+        },
       ],
       labelCol: {
         xs: {span: 8},
@@ -28,12 +28,13 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['qty']" placeholder="请输入数量"  style="width: 100%" />
+              <a-input-number v-decorator="['qty', { rules: [{ required: true}]}]" placeholder="请输入数量" style="width: 100%" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="工艺" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select :disabled="true" v-model="technologyTypeModal" :defaultActiveFirstOption="true" style="width: 250px"
+              <a-select :disabled="true" v-model="technologyTypeModal" :defaultActiveFirstOption="true"
+                        style="width: 250px"
                         @change="handleProvinceChange">
                 <a-select-option v-for="technologyType in technologyTypeList" :key="technologyType.type">
                   {{ technologyType.name }}
@@ -49,7 +50,8 @@
  
           <a-col :span="24">
             <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['sequence']" :disabled="true" placeholder="请输入排序" style="width: 500px"></a-input-number>
+              <a-input-number v-decorator="['sequence']" :disabled="true" placeholder="请输入排序"
+                              style="width: 500px"></a-input-number>
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -59,19 +61,22 @@
             </a-form-item>
           </a-col>
           <a-col :span="24">
-            <a-form-item label="完成人":labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="完成人" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-select-user-by-dep v-model="completeBy" :multi="false"></j-select-user-by-dep>
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="实际完成时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择实际完成时间" v-decorator="['completeDate']" :trigger-change="true"
+              <j-date placeholder="请选择实际完成时间" v-decorator="['completeDate', { rules: [{ required: true}]}]"
+                      :trigger-change="true"
                       style="width: 100%" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="工时" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['completetime', { rules: [{ required: true,  message: '请输入正数!', pattern: '[1-9]\\d*|[1-9]\\d*.\\d*|0.\\d*[1-9]\\d*' }] }]" placeholder="请输入工时"></a-input>
+              <a-input
+                v-decorator="['completetime', { rules: [{ required: true,  message: '请输入正数!', pattern: '[1-9]\\d*|[1-9]\\d*.\\d*|0.\\d*[1-9]\\d*' }] }]"
+                placeholder="请输入工时"></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -100,25 +105,25 @@ export default {
       default: ''
     }
   },
-  data () {
+  data() {
     let technologyTypeList
     let technologyList
     let technologyTypeModal
     let technologyModal
     return {
       form: this.$form.createForm(this),
-      title:"操作",
-      width:800,
+      title: '操作',
+      width: 800,
       visible: false,
       model: {},
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 5 },
+        sm: { span: 5 }
       },
       completeBy: '',
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 16 },
+        sm: { span: 16 }
       },
       confirmLoading: false,
       detailId: 0,
@@ -128,7 +133,7 @@ export default {
       technologyModal
     }
   },
-  created () {
+  created() {
     this.getTechnologyType()
     this.getTechnologyList()
   },
@@ -136,82 +141,88 @@ export default {
     handleProvinceChange(value) {
       this.getTechnologyList(value)
     },
-    add () {
-      this.edit({});
+    add() {
+      this.edit({})
     },
-    edit (record) {
-      this.form.resetFields();
-      this.model = Object.assign({}, record);
-      this.visible = true;
-      this.technologyModal = record.technology;
-      this.technologyTypeModal = record.technologyType;
-      this.detailId = record.id;
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.technologyModal = record.technology
+      this.technologyTypeModal = record.technologyType
+      this.detailId = record.id
       this.getTechnologyList(record.technologyType)
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'drawingNo', 'parentDrawingNo', 'name', 'qty', 'preDate','sequence','completeDate','delayReason', 'completeBy'))
+        this.form.setFieldsValue(pick(this.model, 'drawingNo', 'parentDrawingNo', 'name', 'qty', 'preDate', 'sequence', 'completeDate', 'delayReason', 'completeBy'))
       })
     },
-    close () {
-      this.$emit('close');
-      this.visible = false;
+    close() {
+      this.$emit('close')
+      this.visible = false
     },
-    handleOk () {
-      const that = this;
-      // 触发表单验证
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          that.confirmLoading = true;
-          values.drawingNo = (values.drawingNo || '').trim()
-          values.name = (values.name || '').trim()
-          values.parentDrawingNo = (values.parentDrawingNo || '').trim()
-          let formData = {
-            "detailId": that.detailId,
-            "completeBy": that.completeBy,
-            "completeDate": values.completeDate,
-            "qty": that.model.qty,
-            "delayReason": values.delayReason,
-            "completetime": values.completetime
-          }
-          let obj = addTransaction(formData)
-          obj.then((res) => {
-            if (res.success) {
-              that.$message.success(res.message)
-              that.$emit('ok')
-            } else {
-              that.$message.warning(res.message)
+    handleOk() {
+      const that = this
+      if (this.completeBy === '') {
+        this.$message.warning("请选择完成用户");
+      } else {
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true
+            values.drawingNo = (values.drawingNo || '').trim()
+            values.name = (values.name || '').trim()
+            values.parentDrawingNo = (values.parentDrawingNo || '').trim()
+
+            let formData = {
+              'detailId': that.detailId,
+              'completeBy': that.completeBy,
+              'completeDate': values.completeDate,
+              'qty': that.model.qty,
+              'delayReason': values.delayReason,
+              'completetime': values.completetime
             }
-          }).finally(() => {
-            that.confirmLoading = false
-            that.close()
-          })
-        }
-      })
+            let obj = addTransaction(formData)
+            obj.then((res) => {
+              if (res.success) {
+                that.$message.success(res.message)
+                that.$emit('ok')
+              } else {
+                that.$message.warning(res.message)
+              }
+            }).finally(() => {
+              that.confirmLoading = false
+              that.close()
+            })
+          }
+        })
+      }
+
     },
-    handleCancel () {
+    handleCancel() {
       this.close()
     },
-    popupCallback(row){
-      this.form.setFieldsValue(pick(row,'headerId','drawingNo','name','qty','technology','preDate','weldTechnology','weldBy','weldDate','machiningTechnology','machiningBy','machiningDate','paintTechnology','paintBy','paintDate','completedDate','delayReason'))
+    popupCallback(row) {
+      this.form.setFieldsValue(pick(row, 'headerId', 'drawingNo', 'name', 'qty', 'technology', 'preDate', 'weldTechnology', 'weldBy', 'weldDate', 'machiningTechnology', 'machiningBy', 'machiningDate', 'paintTechnology', 'paintBy', 'paintDate', 'completedDate', 'delayReason'))
     },
     getTechnologyType() {
-      const that = this;
-      let obj = getTechnologyType();
+      const that = this
+      let obj = getTechnologyType()
       obj.then((res) => {
         if (res.success) {
-          that.technologyTypeList = res.result;
+          that.technologyTypeList = res.result
         } else {
-          that.$message.warning(res.message);
+          that.$message.warning(res.message)
         }
       })
     },
     getTechnologyList(val) {
-      const that = this;
-      let obj = getTechnology({val});
+      const that = this
+      let obj = getTechnology({ val })
       obj.then((res) => {
         if (res.success) {
-          that.technologyList = res.result;
+          that.technologyList = res.result
         } else {
-          that.$message.warning(res.message);
+          that.$message.warning(res.message)
         }
       })
     }
@@ -56,21 +56,6 @@
               <j-date placeholder="请选择下图日期/预期完成日期" v-decorator="['preDate']" :trigger-change="true" style="width: 100%" />
             </a-form-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-item label="完成人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['completeBy']" placeholder="请输入完成人" ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="实际完成时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择实际完成时间" v-decorator="['completeDate']" :trigger-change="true" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="延误原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="['delayReason']" placeholder="请输入延误原因" ></a-input>
-            </a-form-item>
-          </a-col>
         </a-row>
       </a-form>
     </a-spin>