调整采购订单、日常巡检

anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue

@@ -148,6 +148,7 @@ export default {
       this.$emit('fileChange', this.files)
     },
     handlePictureCardPreview(file) {
+      this.dialogVisible = true
       this.dialogImageUrl = file.url
     },
     // 上传失败

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -56,6 +56,7 @@
             <el-table-column prop="orderDate" label="采购订单日期" align="center" width="120"/>
             <el-table-column prop="orderType" label="采购订单类型" align="center" width="120"/>
             <el-table-column prop="applicationCode" label="排产申请编号" align="center" width="200"/>
+            <el-table-column prop="subscriptionDate" label="认款日期" align="center" width="100"/>
             <el-table-column prop="insideCode" label="内部编码" header-align="center" align="left" width="120"/>
             <el-table-column prop="vehicleName" label="车型" align="center" width="200"/>
             <el-table-column prop="platformNo" label="台数" align="center" width="80"/>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue

@@ -1,93 +1,104 @@
 <template>
-  <div>
-    <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 添加修改按钮-->
-      <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
-        </el-button>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-      </div>
-      <!--end 添加修改按钮-->
-      <!--end 详情按钮-->
-    </div>
-    <!--标题按钮部分结束-->
-    <!--Start 新增修改部分-->
-    <div class="listconadd">
-      <div class="titwu"><span>采购订单</span></div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>订单类型</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>车型</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>台数</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>订单编号</span></div>
-            <el-form-item><el-input v-model="formobj.orderNo" placeholder="" class="addinputw addinputOne addinputTwo" clearable/></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>订单日期</span></div>
-            <el-form-item><el-date-picker v-model="formobj.orderDate" class="addinputw addinputOne addinputTwo" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">
-          <div>订单进程</div>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
+          </el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
-            <el-form-item><el-date-picker v-model="formobj.expectLaunchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>上线日期</span></div>
-            <el-form-item><el-date-picker v-model="formobj.launchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>下线日期</span></div>
-            <el-form-item><el-date-picker v-model="formobj.offlineDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>备注</span></div>
-            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputOne" clearable/></el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+        <!--end 添加修改按钮-->
+        <!--end 详情按钮-->
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="titwu"><span>采购订单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>订单类型</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
+              <el-form-item>
+                <span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span>
+                <el-button type="primary" size="small" style="margin-left: 10px" @click="handleLook(formobj.purchaseRequisitionSid)">查看</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>车型</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>台数</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>订单编号</span></div>
+              <el-form-item><el-input v-model="formobj.orderNo" placeholder="" class="addinputw addinputOne addinputTwo" clearable/></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>订单日期</span></div>
+              <el-form-item><el-date-picker v-model="formobj.orderDate" class="addinputw addinputOne addinputTwo" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>订单进程</div>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
+              <el-form-item><el-date-picker v-model="formobj.expectLaunchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>上线日期</span></div>
+              <el-form-item><el-date-picker v-model="formobj.launchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>下线日期</span></div>
+              <el-form-item><el-date-picker v-model="formobj.offlineDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>备注</span></div>
+              <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputOne" clearable/></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!--End 添加修改部分-->
     </div>
-    <!--End 添加修改部分-->
+    <cheliangpaichanInfo v-show="viewState == 2" ref="divPaiChan" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/cheliang/busvehicleorder'
+import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
 
 export default {
   name: 'cheliangcaigouAdd',
+  components: {
+    cheliangpaichanInfo
+  },
   data() {
     return {
+      viewState: 1,
       viewTitle: '【编辑】采购订单',
       formobj: {
         applicationCode: '',
@@ -180,6 +191,13 @@ export default {
           return false
         }
       })
+    },
+    handleLook(sid) {
+      this.viewState = 2
+      this.$refs['divPaiChan'].showInfo(sid)
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue

@@ -1,91 +1,102 @@
 <template>
-  <div>
-    <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 添加修改按钮-->
-      <div>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-      </div>
-      <!--end 添加修改按钮-->
-      <!--end 详情按钮-->
-    </div>
-    <!--标题按钮部分结束-->
-    <!--Start 新增修改部分-->
-    <div class="listconadd">
-      <div class="titwu"><span>采购订单</span></div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>订单类型</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>车型</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>台数</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>订单编号</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty spanOneWidth"><span>订单日期</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">
-          <div>订单进程</div>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <!--标题按钮部分开始-->
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 添加修改按钮-->
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.expectLaunchDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>上线日期</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.launchDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>下线日期</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.offlineDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanOneWidth"><span>备注</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+        <!--end 添加修改按钮-->
+        <!--end 详情按钮-->
+      </div>
+      <!--标题按钮部分结束-->
+      <!--Start 新增修改部分-->
+      <div class="listconadd">
+        <div class="titwu"><span>采购订单</span></div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>订单类型</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
+              <el-form-item>
+                <span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span>
+                <el-button type="primary" size="small" style="margin-left: 10px" @click="handleLook(formobj.purchaseRequisitionSid)">查看</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>车型</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>台数</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>订单编号</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty spanOneWidth"><span>订单日期</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">
+            <div>订单进程</div>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.expectLaunchDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>上线日期</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.launchDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>下线日期</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.offlineDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty spanOneWidth"><span>备注</span></div>
+              <el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <!--End 添加修改部分-->
     </div>
-    <!--End 添加修改部分-->
+    <cheliangpaichanInfo v-show="viewState == 2" ref="divPaiChan" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import req from '@/api/cheliang/busvehicleorder'
+import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
 
 export default {
   name: 'cheliangcaigouAdd',
+  components: {
+    cheliangpaichanInfo
+  },
   data() {
     return {
+      viewState: 1,
       viewTitle: '采购订单详情',
       formobj: {},
       rules: {},
@@ -104,10 +115,16 @@ export default {
       req.fetchBySid(row.sid).then(resp => {
         const vdata = resp.data
         this.formobj = vdata
+      }).catch(e => {
+        this.formobj = row
       })
-        .catch(e => {
-          this.formobj = row
-        })
+    },
+    handleLook(sid) {
+      this.viewState = 2
+      this.$refs['divPaiChan'].showInfo(sid)
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue

@@ -30,7 +30,7 @@
             <el-col :span="24">
               <div class="span-sty spanOneWidth"><span>巡检情况说明</span></div>
               <el-form-item>
-                <el-input v-model="formobj.situationExplain" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
+                <el-input v-model="formobj.situationExplain" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="对车辆外观、车辆状态、电瓶情况、箱内燃油情况等进行说明" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
               </el-form-item>
             </el-col>
           </el-row>

anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

@@ -79,7 +79,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" :class="{'rowClass':!currentLink}">
             <div class="span-sty spanTwoWidth"><span>意见:</span></div>
             <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputTwo" clearable ></el-input></el-form-item>
           </el-col>
@@ -170,7 +170,7 @@ export default {
     openAgree(val) {
       this.operation = val
       this.currentLink = true
-      this.dialogList.comment = ''
+      this.dialogList.comment = '同意'
       req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
@@ -205,9 +205,17 @@ export default {
       if (this.operation === '同意') {
         this.handleAgree()
       } else if (this.operation === '驳回') {
-        this.handleReject()
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
       } else if (this.operation === '终止') {
-        this.handleStop()
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
       }
     },
     /** 同意任务 */
@@ -307,5 +315,8 @@ export default {
   border-right: 0px !important;
   border-bottom: 0px !important;
 }
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
 </style>